incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [21/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animc...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/simpress/toolbar/zoombar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/simpress/toolbar/zoombar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/simpress/toolbar/zoombar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/simpress/toolbar/zoombar.xml Wed Jun 27 13:44:09 2012
@@ -23,16 +23,16 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom100Percent" toolbar:helpid="10099"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPrevious" toolbar:visible="false" toolbar:helpid="10403"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomNext" toolbar:visible="false" toolbar:helpid="10402"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPage" toolbar:helpid="10100"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPageWidth" toolbar:helpid="27098"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomOptimal" toolbar:helpid="10101"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:helpid="27099"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom100Percent"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPrevious" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomNext" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPageWidth"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomOptimal"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomObjects"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPanning" toolbar:helpid="27017"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPanning"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/set_soenv.in?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/set_soenv.in (original)
+++ incubator/ooo/branches/alg/aw080/main/set_soenv.in Wed Jun 27 13:44:09 2012
@@ -1155,8 +1155,7 @@ if ($platform =~ m/cygwin|os2/)
 # The general environment path.
 if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
 {  $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$BIN;
 
    if ($platform =~ m/solaris/) {
@@ -1185,9 +1184,8 @@ elsif ($platform =~ m/cygwin/)
    my ( $tmppath );
 
    $PATH              = $cur_dir.
-#                        $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
                         $ps.CygFormat($SOLARENV).$ds."bin".
-                        $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
+                        $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
 
    if ( $JAVA_HOME ne "" )
    {
@@ -1318,9 +1316,8 @@ elsif ($platform =~ m/os2/)
    # needed is appended to the end.
 
    $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds."bin".
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN;
+                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
 
    if ( $JAVA_HOME ne "" )
    {
@@ -1351,8 +1348,7 @@ elsif ($platform =~ m/os2/)
 
 elsif ($platform =~ m/darwin/)
 {  $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$BIN;
 
   # Append old PATH
@@ -1989,7 +1985,19 @@ ToFile( "SYSTEM_SAXON",      "@SYSTEM_SA
 ToFile( "SAXON_JAR",         "@SAXON_JAR@",        "e" );
 ToFile( "DISABLE_SAXON",     "@DISABLE_SAXON@",    "e" );
 ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JAVASCRIPT@","e" );
+ToFile( "SYSTEM_APR",        "@SYSTEM_APR@",       "e" );
+ToFile( "APR_CFLAGS",        "@APR_CFLAGS@",       "e" );
+ToFile( "APR_LIBS",          "@APR_LIBS@",         "e" );
+ToFile( "SYSTEM_APRUTIL",    "@SYSTEM_APRUTIL@",   "e" );
+ToFile( "APRUTIL_CFLAGS",    "@APRUTIL_CFLAGS@",   "e" );
+ToFile( "APRUTIL_LIBS",      "@APRUTIL_LIBS@",     "e" );
+ToFile( "SYSTEM_SERF",       "@SYSTEM_SERF@",      "e" );
+ToFile( "SERF_CFLAGS",       "@SERF_CFLAGS@",      "e" );
+ToFile( "SERF_LIBS",         "@SERF_LIBS@",        "e" );
+ToFile( "SYSTEM_COINMP",     "@SYSTEM_COINMP@",    "e" );
 ToFile( "ENABLE_COINMP",     "@ENABLE_COINMP@",    "e" );
+ToFile( "COINMP_CFLAGS",     "@COINMP_CFLAGS@",    "e" );
+ToFile( "COINMP_LIBS",       "@COINMP_LIBS@",      "e" );
 ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/controlwrapper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/controlwrapper.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/controlwrapper.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/controlwrapper.hxx Wed Jun 27 13:44:09 2012
@@ -631,13 +631,13 @@ void MetricFieldWrapper< ValueT >::SetCo
 template< typename ValueT >
 ValueT ListBoxWrapper< ValueT >::GetControlValue() const
 {
-    return GetValueFromPos( this->GetControl().GetSelectEntryPos() );
+    return this->GetValueFromPos( this->GetControl().GetSelectEntryPos() );
 }
 
 template< typename ValueT >
 void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue )
 {
-    sal_uInt16 nPos = GetPosFromValue( nValue );
+    sal_uInt16 nPos = this->GetPosFromValue( nValue );
     if( nPos != this->GetNotFoundPos() )
         this->GetControl().SelectEntryPos( nPos );
 }
@@ -647,13 +647,13 @@ void ListBoxWrapper< ValueT >::SetContro
 template< typename ValueT >
 ValueT ValueSetWrapper< ValueT >::GetControlValue() const
 {
-    return GetValueFromPos( this->GetControl().GetSelectItemId() );
+    return this->GetValueFromPos( this->GetControl().GetSelectItemId() );
 }
 
 template< typename ValueT >
 void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue )
 {
-    sal_uInt16 nPos = GetPosFromValue( nValue );
+    sal_uInt16 nPos = this->GetPosFromValue( nValue );
     if( nPos != this->GetNotFoundPos() )
         this->GetControl().SelectItem( nPos );
 }

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/objsh.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/objsh.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/objsh.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/inc/sfx2/objsh.hxx Wed Jun 27 13:44:09 2012
@@ -213,6 +213,7 @@ private:
 	SfxObjectCreateMode 		eCreateMode;		// Zweck des Objekts
 	sal_Bool					bHasName :1,		// sal_True := bestehendes Objekt, sal_False := es ist ein neues Objekt
                                 bIsTmp :1;          // temp. Storage
+        sal_Bool 		bIsInGenerateThumbnail;	//optimize thumbnail generate and store procedure to improve odt saving performance, i120030
 
 private:
 //#if 0 // _SOLAR__PRIVATE
@@ -445,6 +446,8 @@ public:
 									sal_Bool bIsTemplate,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream );
 
+	sal_Bool					IsInGenerateAndStoreThumbnail() const {return bIsInGenerateThumbnail;}//optimize thumbnail generate and store procedure to improve odt saving performance, i120030
+
 	// Transfer IFace
 	void                        AbortImport();
 	sal_Bool                    IsAbortingImport() const;

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/app.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/app.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/app.src (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/app.src Wed Jun 27 13:44:09 2012
@@ -372,7 +372,7 @@ String STR_QUICKSTART_PRELAUNCH
 };
 String STR_QUICKSTART_PRELAUNCH_UNX
 {
-	Text[ en-US ] = "Disable systray Quickstarter";
+	Text[ en-US ] = "Disable Quickstarter";
 };
 String STR_QUICKSTART_LNKNAME
 {

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/lnkbase2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/lnkbase2.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/lnkbase2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/lnkbase2.cxx Wed Jun 27 13:44:09 2012
@@ -131,12 +131,19 @@ public:
 *************************************************************************/
 
 SvBaseLink::SvBaseLink()
+:   SvRefBase(),
+    xObj(),
+    aLinkName(),
+    pImpl(new BaseLink_Impl()),
+    nObjType(OBJECT_CLIENT_SO),
+    bVisible(sal_True),
+    bSynchron(sal_True),
+    bUseCache(sal_True),
+    bWasLastEditOK(sal_False),
+    pImplData(new ImplBaseLinkData),
+    m_bIsReadOnly(false),
+    m_xInputStreamToLoadFrom()
 {
-    pImpl = new BaseLink_Impl();
-	nObjType = OBJECT_CLIENT_SO;
-	pImplData = new ImplBaseLinkData;
-	bVisible = bSynchron = bUseCache = sal_True;
-    bWasLastEditOK = sal_False;
 }
 
 /************************************************************************
@@ -146,13 +153,19 @@ SvBaseLink::SvBaseLink()
 *************************************************************************/
 
 SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
+:   SvRefBase(),
+    xObj(),
+    aLinkName(),
+    pImpl(new BaseLink_Impl()),
+    nObjType(OBJECT_CLIENT_SO),
+    bVisible(sal_True),
+    bSynchron(sal_True),
+    bUseCache(sal_True),
+    bWasLastEditOK(sal_False),
+    pImplData(new ImplBaseLinkData),
+    m_bIsReadOnly(false),
+    m_xInputStreamToLoadFrom()
 {
-    pImpl = new BaseLink_Impl();
-	nObjType = OBJECT_CLIENT_SO;
-	pImplData = new ImplBaseLinkData;
-	bVisible = bSynchron = bUseCache = sal_True;
-    bWasLastEditOK = sal_False;
-
 	// falls es ein Ole-Link wird,
 	pImplData->ClientType.nUpdateMode = nUpdateMode;
 	pImplData->ClientType.nCntntType = nContentType;
@@ -166,13 +179,19 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpda
 *************************************************************************/
 
 SvBaseLink::SvBaseLink( const String& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
+:   SvRefBase(),
+    xObj(),
+    aLinkName(rLinkName),
+    pImpl(0),
+    nObjType(nObjectType),
+    bVisible(sal_True),
+    bSynchron(sal_True),
+    bUseCache(sal_True),
+    bWasLastEditOK(sal_False),
+    pImplData(new ImplBaseLinkData),
+    m_bIsReadOnly(false),
+    m_xInputStreamToLoadFrom()
 {
-	bVisible = bSynchron = bUseCache = sal_True;
-    bWasLastEditOK = sal_False;
-	aLinkName = rLinkName;
-	pImplData = new ImplBaseLinkData;
-	nObjType = nObjectType;
-
 	if( !pObj )
 	{
 		DBG_ASSERT( pObj, "Wo ist mein zu linkendes Object" );
@@ -220,18 +239,30 @@ SvBaseLink::~SvBaseLink()
 	}
 
 	delete pImplData;
+
+    if(pImpl)
+    {
+        delete pImpl;
+    }
 }
 
 IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
 {
-    String sNewName;
-    if ( _pNewName )
-        sNewName = *_pNewName;
-    if ( !ExecuteEdit( sNewName ) )
-        sNewName.Erase();
-    bWasLastEditOK = ( sNewName.Len() > 0 );
-    if ( pImpl->m_aEndEditLink.IsSet() )
-        pImpl->m_aEndEditLink.Call( this );
+    if(pImpl)
+    {
+        String sNewName;
+        if ( _pNewName )
+            sNewName = *_pNewName;
+        if ( !ExecuteEdit( sNewName ) )
+            sNewName.Erase();
+        bWasLastEditOK = ( sNewName.Len() > 0 );
+        if ( pImpl->m_aEndEditLink.IsSet() )
+            pImpl->m_aEndEditLink.Call( this );
+    }
+    else
+    {
+        OSL_ENSURE(false, "No pImpl (!)");
+    }
     return 0;
 }
 
@@ -405,35 +436,42 @@ sal_uInt16 SvBaseLink::GetUpdateMode() c
 
 void SvBaseLink::_GetRealObject( sal_Bool bConnect)
 {
-    if( !pImpl->m_pLinkMgr )
-		return;
+    if(pImpl)
+    {
+        if( !pImpl->m_pLinkMgr )
+		    return;
 
-	DBG_ASSERT( !xObj.Is(), "object already exist" );
+	    DBG_ASSERT( !xObj.Is(), "object already exist" );
 
-	if( OBJECT_CLIENT_DDE == nObjType )
-	{
-		String sServer;
-        if( pImpl->m_pLinkMgr->GetDisplayNames( this, &sServer ) &&
-			sServer == GetpApp()->GetAppName() )		// interner Link !!!
-		{
-			// damit der Internal - Link erzeugt werden kann !!!
-			nObjType = OBJECT_INTERN;
+	    if( OBJECT_CLIENT_DDE == nObjType )
+	    {
+		    String sServer;
+            if( pImpl->m_pLinkMgr->GetDisplayNames( this, &sServer ) &&
+			    sServer == GetpApp()->GetAppName() )		// interner Link !!!
+		    {
+			    // damit der Internal - Link erzeugt werden kann !!!
+			    nObjType = OBJECT_INTERN;
+                xObj = pImpl->m_pLinkMgr->CreateObj( this );
+
+			    pImplData->ClientType.bIntrnlLnk = sal_True;
+			    nObjType = OBJECT_CLIENT_DDE;		// damit wir wissen was es mal war !!
+		    }
+		    else
+		    {
+			    pImplData->ClientType.bIntrnlLnk = sal_False;
+                xObj = pImpl->m_pLinkMgr->CreateObj( this );
+		    }
+	    }
+	    else if( OBJECT_CLIENT_SO & nObjType )
             xObj = pImpl->m_pLinkMgr->CreateObj( this );
 
-			pImplData->ClientType.bIntrnlLnk = sal_True;
-			nObjType = OBJECT_CLIENT_DDE;		// damit wir wissen was es mal war !!
-		}
-		else
-		{
-			pImplData->ClientType.bIntrnlLnk = sal_False;
-            xObj = pImpl->m_pLinkMgr->CreateObj( this );
-		}
-	}
-	else if( (OBJECT_CLIENT_SO & nObjType) )
-        xObj = pImpl->m_pLinkMgr->CreateObj( this );
-
-    if( bConnect && ( !xObj.Is() || !xObj->Connect( this ) ) )
-		Disconnect();
+        if( bConnect && ( !xObj.Is() || !xObj->Connect( this ) ) )
+		    Disconnect();
+    }
+    else
+    {
+        OSL_ENSURE(false, "No pImpl (!)");
+    }
 }
 
 sal_uIntPtr SvBaseLink::GetContentType() const
@@ -457,17 +495,34 @@ sal_Bool SvBaseLink::SetContentType( sal
 
 LinkManager* SvBaseLink::GetLinkManager()
 {
-    return pImpl->m_pLinkMgr;
+    if(pImpl)
+    {
+        return pImpl->m_pLinkMgr;
+    }
+    
+    return 0;
 }
 
 const LinkManager* SvBaseLink::GetLinkManager() const
 {
-    return pImpl->m_pLinkMgr;
+    if(pImpl)
+    {
+        return pImpl->m_pLinkMgr;
+    }
+    
+    return 0;
 }
 
 void SvBaseLink::SetLinkManager( LinkManager* _pMgr )
 {
-    pImpl->m_pLinkMgr = _pMgr;
+    if(pImpl)
+    {
+        pImpl->m_pLinkMgr = _pMgr;
+    }
+    else
+    {
+        OSL_ENSURE(false, "No pImpl (!)");
+    }
 }
 
 void SvBaseLink::Disconnect()
@@ -493,79 +548,94 @@ void SvBaseLink::DataChanged( const Stri
 
 void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
 {
-    pImpl->m_pParentWin = pParent;
-    pImpl->m_aEndEditLink = rEndEditHdl;
-    pImpl->m_bIsConnect = ( xObj.Is() != sal_False );
-    if( !pImpl->m_bIsConnect )
-		_GetRealObject( xObj.Is() );
-
-    bool bAsync = false;
-    Link aLink = LINK( this, SvBaseLink, EndEditHdl );
-
-    if( OBJECT_CLIENT_SO & nObjType && pImplData->ClientType.bIntrnlLnk )
-	{
-        if( pImpl->m_pLinkMgr )
-		{
-            SvLinkSourceRef ref = pImpl->m_pLinkMgr->CreateObj( this );
-			if( ref.Is() )
-            {
-                ref->Edit( pParent, this, aLink );
-                bAsync = true;
-            }
-		}
-	}
-	else
+    if(pImpl)
     {
-        xObj->Edit( pParent, this, aLink );
-        bAsync = true;
-    }
+        pImpl->m_pParentWin = pParent;
+        pImpl->m_aEndEditLink = rEndEditHdl;
+        pImpl->m_bIsConnect = ( xObj.Is() != sal_False );
+        if( !pImpl->m_bIsConnect )
+		    _GetRealObject( xObj.Is() );
+
+        bool bAsync = false;
+        Link aLink = LINK( this, SvBaseLink, EndEditHdl );
+
+        if( OBJECT_CLIENT_SO & nObjType && pImplData->ClientType.bIntrnlLnk )
+	    {
+            if( pImpl->m_pLinkMgr )
+		    {
+                SvLinkSourceRef ref = pImpl->m_pLinkMgr->CreateObj( this );
+			    if( ref.Is() )
+                {
+                    ref->Edit( pParent, this, aLink );
+                    bAsync = true;
+                }
+		    }
+	    }
+	    else
+        {
+            xObj->Edit( pParent, this, aLink );
+            bAsync = true;
+        }
 
-    if ( !bAsync )
+        if ( !bAsync )
+        {
+            ExecuteEdit( String() );
+            bWasLastEditOK = sal_False;
+            if ( pImpl->m_aEndEditLink.IsSet() )
+                pImpl->m_aEndEditLink.Call( this );
+        }
+    }
+    else
     {
-        ExecuteEdit( String() );
-        bWasLastEditOK = sal_False;
-        if ( pImpl->m_aEndEditLink.IsSet() )
-            pImpl->m_aEndEditLink.Call( this );
+        OSL_ENSURE(false, "No pImpl (!)");
     }
 }
 
 bool SvBaseLink::ExecuteEdit( const String& _rNewName )
 {
-    if( _rNewName.Len() != 0 )
+    if(pImpl)
     {
-        SetLinkSourceName( _rNewName );
-        if( !Update() )
+        if( _rNewName.Len() != 0 )
         {
-            String sApp, sTopic, sItem, sError;
-            pImpl->m_pLinkMgr->GetDisplayNames( this, &sApp, &sTopic, &sItem );
-            if( nObjType == OBJECT_CLIENT_DDE )
+            SetLinkSourceName( _rNewName );
+            if( !Update() )
             {
-                sError = SfxResId( STR_DDE_ERROR );
-
-                sal_uInt16 nFndPos = sError.Search( '%' );
-                if( STRING_NOTFOUND != nFndPos )
-                {
-                    sError.Erase( nFndPos, 1 ).Insert( sApp, nFndPos );
-                    nFndPos = nFndPos + sApp.Len();
-                }
-                if( STRING_NOTFOUND != ( nFndPos = sError.Search( '%', nFndPos )))
+                String sApp, sTopic, sItem, sError;
+                pImpl->m_pLinkMgr->GetDisplayNames( this, &sApp, &sTopic, &sItem );
+                if( nObjType == OBJECT_CLIENT_DDE )
                 {
-                    sError.Erase( nFndPos, 1 ).Insert( sTopic, nFndPos );
-                    nFndPos = nFndPos + sTopic.Len();
+                    sError = SfxResId( STR_DDE_ERROR );
+
+                    sal_uInt16 nFndPos = sError.Search( '%' );
+                    if( STRING_NOTFOUND != nFndPos )
+                    {
+                        sError.Erase( nFndPos, 1 ).Insert( sApp, nFndPos );
+                        nFndPos = nFndPos + sApp.Len();
+                    }
+                    if( STRING_NOTFOUND != ( nFndPos = sError.Search( '%', nFndPos )))
+                    {
+                        sError.Erase( nFndPos, 1 ).Insert( sTopic, nFndPos );
+                        nFndPos = nFndPos + sTopic.Len();
+                    }
+                    if( STRING_NOTFOUND != ( nFndPos = sError.Search( '%', nFndPos )))
+                        sError.Erase( nFndPos, 1 ).Insert( sItem, nFndPos );
                 }
-                if( STRING_NOTFOUND != ( nFndPos = sError.Search( '%', nFndPos )))
-                    sError.Erase( nFndPos, 1 ).Insert( sItem, nFndPos );
-            }
-            else
-                return false;
+                else
+                    return false;
 
-            ErrorBox( pImpl->m_pParentWin, WB_OK, sError ).Execute();
+                ErrorBox( pImpl->m_pParentWin, WB_OK, sError ).Execute();
+            }
         }
+        else if( !pImpl->m_bIsConnect )
+            Disconnect();
+        pImpl->m_bIsConnect = false;
+        return true;
+    }
+    else
+    {
+        OSL_ENSURE(false, "No pImpl (!)");
+        return false;
     }
-    else if( !pImpl->m_bIsConnect )
-        Disconnect();
-    pImpl->m_bIsConnect = false;
-    return true;
 }
 
 void SvBaseLink::Closed()
@@ -577,10 +647,18 @@ void SvBaseLink::Closed()
 
 FileDialogHelper* SvBaseLink::GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const
 {
-    if ( pImpl->m_pFileDlg )
-        delete pImpl->m_pFileDlg;
-    pImpl->m_pFileDlg = new FileDialogHelper( nFlags, rFactory );
-    return pImpl->m_pFileDlg;
+    if(pImpl)
+    {
+        if ( pImpl->m_pFileDlg )
+            delete pImpl->m_pFileDlg;
+        pImpl->m_pFileDlg = new FileDialogHelper( nFlags, rFactory );
+        return pImpl->m_pFileDlg;
+    }
+    else
+    {
+        OSL_ENSURE(false, "No pImpl (!)");
+        return 0;
+    }
 }
 
 ImplDdeItem::~ImplDdeItem()

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/shutdowniconunx.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/shutdowniconunx.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/shutdowniconunx.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/appl/shutdowniconunx.cxx Wed Jun 27 13:44:09 2012
@@ -313,20 +313,29 @@ static void refresh_menu( GtkWidget *pMe
     gtk_widget_set_sensitive( pDisableMenuItem, !bModal);
 }
 
+static void activate_cb( GtkStatusIcon *status_icon,
+                         gpointer pMenu )
+{
+    refresh_menu( GTK_WIDGET( pMenu ) );
+
+    gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
+                    gtk_status_icon_position_menu,
+                    status_icon, 0, gtk_get_current_event_time() );
+}
 
-static gboolean display_menu_cb( GtkWidget *,
-								 GdkEventButton *event, GtkWidget *pMenu )
+static void popup_menu_cb(GtkStatusIcon *status_icon,
+                          guint button,
+                          guint activate_time,
+                          gpointer pMenu)
 {
-	if (event->button == 2)
-		return sal_False;
+	if (button == 2)
+		return;
 
-	refresh_menu( pMenu );
+	refresh_menu( GTK_WIDGET( pMenu ) );
 
 	gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
                     gtk_status_icon_position_menu,
-                    pTrayIcon, 0, event->time );
-
-	return sal_True;
+                    status_icon, button, activate_time );
 }
 
 void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
@@ -359,16 +368,23 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sy
 	GdkPixbuf *pPixbuf = ResIdToPixbuf( SV_ICON_LARGE_START + SV_ICON_ID_OFFICE );
     g_object_set( G_OBJECT( pTrayIcon ),
                   "pixbuf", pPixbuf,
-                  "title", aLabel.getStr(),
+                  "title", aLabel.getStr(),/* Since 2.18 */
+                  "tooltip-text", aLabel.getStr(), /* Since 2.16 */
                   NULL );
 	g_object_unref( pPixbuf );
 
-    gtk_status_icon_set_tooltip_text( pTrayIcon, aLabel.getStr() );
+	// gtk_status_icon_set_tooltip_text is available since 2.16
+    // so use instead deprecated gtk_status_icon_set_tooltip
+   gtk_status_icon_set_tooltip( pTrayIcon, aLabel.getStr() );
 
 	GtkWidget *pMenu = gtk_menu_new();
 
-    g_signal_connect( pTrayIcon, "button-press-event",
-                      G_CALLBACK( display_menu_cb ), pMenu );
+	// Signal "button-press-event" is available since 2.14
+    // Use "activate" and "popup-menu" instead
+    g_signal_connect( pTrayIcon, "activate",
+                      G_CALLBACK( activate_cb ), pMenu );
+    g_signal_connect( pTrayIcon, "popup-menu",
+                      G_CALLBACK( popup_menu_cb ), pMenu );
 
     g_signal_connect( pMenu, "deactivate",
                       G_CALLBACK (menu_deactivate_cb), NULL);

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objcont.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objcont.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objcont.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objcont.cxx Wed Jun 27 13:44:09 2012
@@ -166,10 +166,12 @@ SfxObjectShell::CreatePreviewMetaFile_Im
     pFile->Record( &aDevice );
 
     LanguageType eLang;
-    SvtCTLOptions*  pCTLOptions = new SvtCTLOptions;
-    if ( SvtCTLOptions::NUMERALS_HINDI == pCTLOptions->GetCTLTextNumerals() )
+    // #120038# use local incarnation, so deletion cannot be forgotten
+    const SvtCTLOptions aCTLOptions;
+
+    if ( SvtCTLOptions::NUMERALS_HINDI == aCTLOptions.GetCTLTextNumerals() )
         eLang = LANGUAGE_ARABIC_SAUDI_ARABIA;
-    else if ( SvtCTLOptions::NUMERALS_ARABIC == pCTLOptions->GetCTLTextNumerals() )
+    else if ( SvtCTLOptions::NUMERALS_ARABIC == aCTLOptions.GetCTLTextNumerals() )
         eLang = LANGUAGE_ENGLISH;
     else
         eLang = (LanguageType) Application::GetSettings().GetLanguage();
@@ -757,12 +759,16 @@ sal_Bool SfxObjectShell::Print
 		{
 			SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool();
 			SetOrganizerSearchMask(pStylePool);
-			SfxStyleSheetIterator* pIter = pStylePool->CreateIterator(
-				pStylePool->GetSearchFamily(), pStylePool->GetSearchMask() );
-			sal_uInt16 nStyles = pIter->Count();
-			SfxStyleSheetBase *pStyle = pIter->First();
-			if ( !pStyle )
-				return sal_True;
+
+            // memory leak #i120077#
+            SfxStyleSheetIterator aIter(pStylePool, pStylePool->GetSearchFamily(), pStylePool->GetSearchMask());
+			sal_uInt16 nStyles = aIter.Count();
+			SfxStyleSheetBase *pStyle = aIter.First();
+			
+            if ( !pStyle )
+            {
+                return sal_True;
+            }
 
             // pepare adaptor for old style StartPage/EndPage printing
             boost::shared_ptr< Printer > pPrinter( new Printer( rPrt.GetJobSetup() ) );
@@ -861,13 +867,12 @@ sal_Bool SfxObjectShell::Print
 					pPrinter->DrawText(aOutPos, aTmp);
 					aOutPos.Y() += pPrinter->GetTextHeight();
 				}
-				pStyle = pIter->Next();
+				pStyle = aIter.Next();
 			}
 			pAdaptor->EndPage();
             
             Printer::PrintJob( pController, rPrt.GetJobSetup() );
 
-			delete pIter;
 			break;
 		}
 	  default:

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objstor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objstor.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objstor.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/objstor.cxx Wed Jun 27 13:44:09 2012
@@ -2431,7 +2431,29 @@ sal_Bool SfxObjectShell::ImportFrom( Sfx
             aArgs[nEnd-1].Value <<= rMedium.GetBaseURL();
         }
 
-        return xLoader->filter( aArgs );
+//-> #i119492
+//        return xLoader->filter( aArgs );
+// During loading, some OLE objects like chart will be set modified flag, so needs to reset the flag to false after loading
+        sal_Bool bRtn = xLoader->filter( aArgs );
+        uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames();
+        for ( sal_Int32 n = 0; n < aNames.getLength(); n++ )
+        {
+            ::rtl::OUString	aName = aNames[n];
+            uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aName );
+            OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+            if ( xObj.is() )
+            {
+                sal_Int32 nState = xObj->getCurrentState();
+                if ( nState == embed::EmbedStates::LOADED || nState == embed::EmbedStates::RUNNING )	// means that the object is not active
+                {
+                    uno::Reference< util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY );
+                    if ( xModifiable.is() )
+                        xModifiable->setModified(sal_False);
+                }
+            }
+        }
+        return bRtn;
+//<- #i119492
         }catch(const uno::Exception&)
         {}
     }
@@ -2886,6 +2908,9 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Imp
 
     // in "SaveAs" title and password will be cleared ( maybe the new itemset contains new values, otherwise they will be empty )
     pMergedParams->ClearItem( SID_PASSWORD );
+    // 119366 - As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for setting passward together, we need to clear them both.
+    // Also, ( maybe the new itemset contains new values, otherwise they will be empty )
+    pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
     pMergedParams->ClearItem( SID_DOCINFO_TITLE );
 
     pMergedParams->ClearItem( SID_INPUTSTREAM );
@@ -3659,6 +3684,8 @@ sal_Bool SfxObjectShell::GenerateAndStor
                                                     const uno::Reference< embed::XStorage >& xStor )
 {
     RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::GenerateAndStoreThumbnail" );
+	
+    bIsInGenerateThumbnail = sal_True;//optimize thumbnail generate and store procedure to improve odt saving performance, i120030
 
     sal_Bool bResult = sal_False;
 
@@ -3683,6 +3710,8 @@ sal_Bool SfxObjectShell::GenerateAndStor
     catch( uno::Exception& )
     {
     }
+	
+    bIsInGenerateThumbnail = sal_False;//optimize thumbnail generate and store procedure to improve odt saving performance, i120030
 
     return bResult;
 }

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/sfxbasemodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/sfxbasemodel.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/sfxbasemodel.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/doc/sfxbasemodel.cxx Wed Jun 27 13:44:09 2012
@@ -2788,41 +2788,53 @@ void SfxBaseModel::impl_store(  const   
                 const SfxFilter* pFilter = pMedium->GetFilter();
                 if ( pFilter && aFilterName.equals( pFilter->GetFilterName() ) )
                 {
-                    aArgHash.erase( aFilterString );
-                    aArgHash.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) );
-
-                    try
+                    // 119366 - If the former file saving with password, do not trying in StoreSelf anyway...
+                    bool bFormerPassword = false;
                     {
-                        storeSelf( aArgHash.getAsConstPropertyValueList() );
-                        bSaved = sal_True;
+                        uno::Sequence< beans::NamedValue > aOldEncryptionData;
+                        if (GetEncryptionData_Impl( pMedium->GetItemSet(), aOldEncryptionData ))
+                        {
+                            bFormerPassword = true;
+                        }
                     }
-                    catch( const lang::IllegalArgumentException& )
+                    if ( !bFormerPassword )
                     {
-                        // some additional arguments do not allow to use saving, SaveAs should be done
-                        // but only for normal documents, the shared documents would be overwritten in this case
-                        // that would mean an information loss
-                        // TODO/LATER: need a new interaction for this case
-                        if ( m_pData->m_pObjectShell->IsDocShared() )
-                        {
-                            m_pData->m_pObjectShell->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't store shared document!" ) ) );
-                            m_pData->m_pObjectShell->StoreLog();
+                        aArgHash.erase( aFilterString );
+                        aArgHash.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) );
 
-                            uno::Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionData" ) ), uno::Sequence< beans::NamedValue >() );
-                            if ( !aNewEncryptionData.getLength() )
+                        try
+                        {
+                            storeSelf( aArgHash.getAsConstPropertyValueList() );
+                            bSaved = sal_True;
+                        }
+                        catch( const lang::IllegalArgumentException& )
+                        {
+                            // some additional arguments do not allow to use saving, SaveAs should be done
+                            // but only for normal documents, the shared documents would be overwritten in this case
+                            // that would mean an information loss
+                            // TODO/LATER: need a new interaction for this case
+                            if ( m_pData->m_pObjectShell->IsDocShared() )
                             {
-                                ::rtl::OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ), ::rtl::OUString() );
-                                aNewEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aNewPassword );
-                            }
+                                m_pData->m_pObjectShell->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't store shared document!" ) ) );
+                                m_pData->m_pObjectShell->StoreLog();
 
-                            uno::Sequence< beans::NamedValue > aOldEncryptionData;
-                            GetEncryptionData_Impl( pMedium->GetItemSet(), aOldEncryptionData );
+                                uno::Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionData" ) ), uno::Sequence< beans::NamedValue >() );
+                                if ( !aNewEncryptionData.getLength() )
+                                {
+                                    ::rtl::OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ), ::rtl::OUString() );
+                                    aNewEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aNewPassword );
+                                }
 
-                            if ( !aOldEncryptionData.getLength() && !aNewEncryptionData.getLength() )
-                                throw;
-                            else
-                            {
-                                // if the password is changed a special error should be used in case of shared document
-                                throw task::ErrorCodeIOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change password for shared document." ) ), uno::Reference< uno::XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE );
+                                uno::Sequence< beans::NamedValue > aOldEncryptionData;
+                                GetEncryptionData_Impl( pMedium->GetItemSet(), aOldEncryptionData );
+
+                                if ( !aOldEncryptionData.getLength() && !aNewEncryptionData.getLength() )
+                                    throw;
+                                else
+                                {
+                                    // if the password is changed a special error should be used in case of shared document
+                                    throw task::ErrorCodeIOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change password for shared document." ) ), uno::Reference< uno::XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE );
+                                }
                             }
                         }
                     }

Modified: incubator/ooo/branches/alg/aw080/main/sfx2/source/view/orgmgr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sfx2/source/view/orgmgr.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sfx2/source/view/orgmgr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sfx2/source/view/orgmgr.cxx Wed Jun 27 13:44:09 2012
@@ -531,6 +531,7 @@ sal_Bool	SfxOrganizeMgr::Delete(SfxOrgan
 			for ( nInd = 0; nInd < nToDeleteNum; nInd++ )
 				if ( pEntriesToDelete[nInd] )
 					pCaller->GetModel()->Remove( pEntriesToDelete[nInd] );
+			delete[] pEntriesToDelete;
 
 			if ( !pCaller->GetModel()->GetChildCount( pGroupToDelete ) )
             {

Modified: incubator/ooo/branches/alg/aw080/main/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx Wed Jun 27 13:44:09 2012
@@ -73,6 +73,11 @@ namespace unx
 #include <X11/X.h>
 #include <GL/glx.h>
 #include <GL/glxext.h>
+
+#if GLX_GLXEXT_VERSION<18
+    typedef void(*PFNGLXBINDTEXIMAGEEXTPROC)(Display*dpy,GLXDrawable,int,const int*);
+    typedef void(*PFNGLXRELEASETEXIMAGEEXTPROC)(Display*,GLXDrawable,int);
+#endif
 }
 #endif
 #include <vcl/sysdata.hxx>

Modified: incubator/ooo/branches/alg/aw080/main/slideshow/source/inc/tools.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/slideshow/source/inc/tools.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/slideshow/source/inc/tools.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/slideshow/source/inc/tools.hxx Wed Jun 27 13:44:09 2012
@@ -71,6 +71,13 @@ namespace slideshow
 
         typedef ::boost::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;
 
+        template <typename T>
+        inline ::std::size_t hash_value( T * const& p )
+        {
+            ::std::size_t d = static_cast< ::std::size_t >(
+                reinterpret_cast< ::std::ptrdiff_t >(p) );
+            return d + (d >> 3);
+        }
         // xxx todo: remove with boost::hash when 1.33 is available
         template <typename T>
         struct hash : ::std::unary_function<T, ::std::size_t>
@@ -79,14 +86,10 @@ namespace slideshow
                 return hash_value(val);
             }
         };
-        template <typename T>
-        inline ::std::size_t hash_value( T * const& p )
-        {
-            ::std::size_t d = static_cast< ::std::size_t >(
-                reinterpret_cast< ::std::ptrdiff_t >(p) );
-            return d + (d >> 3);
-        }
-    
+    }
+}
+
+namespace com { namespace sun { namespace star { namespace uno {
         // xxx todo: shift to namespace com::sun::star::uno when
         //           1.33 is available
         template <typename T>
@@ -98,9 +101,14 @@ namespace slideshow
             ::com::sun::star::uno::Reference<
                   ::com::sun::star::uno::XInterface> const xRoot(
                       x, ::com::sun::star::uno::UNO_QUERY );
-            return hash<void *>()(xRoot.get());
+            return slideshow::internal::hash<void *>()(xRoot.get());
         }
+}}}}
 
+namespace slideshow
+{
+    namespace internal
+    {
         /** Cycle mode of intrinsic animations
          */
         enum CycleMode

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/build.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/build.pl?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/build.pl (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/build.pl Wed Jun 27 13:44:09 2012
@@ -3554,6 +3554,9 @@ sub is_gnumake_module {
 }
 
 sub check_partial_gnumake_build {
+    # Do not disable the build command for a single module just for education.
+    return;
+    
     if(!$build_all_parents && is_gnumake_module(shift)) {
         print "This module has been migrated to GNU make.\n";
         print "You can only use build --all/--since here with build.pl.\n";

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/ExtensionsLst.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/ExtensionsLst.pm?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/ExtensionsLst.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/ExtensionsLst.pm Wed Jun 27 13:44:09 2012
@@ -268,7 +268,7 @@ sub EvaluateSelector($$)
             return $left_result || $right_result;
         }
     }
-    elsif ($expression =~ /^\s*(.+?)\s$/)
+    elsif ($expression =~ /^\s*(.+?)\s*$/)
     {
         return EvaluateTerm($1, $languages);
     }
@@ -424,10 +424,33 @@ sub Download (@)
         {
             push @missing, $entry;
         }
+        elsif (defined $md5sum)
+        {
+            # Check that the MD5 sum is still correct.
+            # The datafile may have been updated with a new version of the extension that
+            # still has the same name but a different MD5 sum.
+            my $cur_oxt;
+            if ( ! open($cur_oxt, $candidate))
+            {
+                # Can not read the extension.  Download extension again.
+                push @missing, $entry;
+                unlink($candidate);
+            }
+            binmode($cur_oxt);
+            my $file_md5 = Digest::MD5->new->addfile(*$cur_oxt)->hexdigest;
+            close($cur_oxt);
+            if ($md5sum ne $file_md5)
+            {
+                # MD5 does not match.  Download extension again.
+                print "extension $name has wrong MD5 and will be updated\n";
+                push @missing, $entry;
+                unlink($candidate);
+            }
+        }
     }
     if ($#missing >= 0)
     {
-        printf "downloading %d missing extension%s\n", $#missing+1, $#missing>0 ? "s" : "";
+        printf "downloading/updating %d extension%s\n", $#missing+1, $#missing>0 ? "s" : "";
         if ( ! -d $download_path)
         {
             mkdir File::Spec->catpath($download_path, "tmp")

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/SvnRevision.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/SvnRevision.pm?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/SvnRevision.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/SvnRevision.pm Wed Jun 27 13:44:09 2012
@@ -36,7 +36,7 @@ sub DetectRevisionIdFromGit ($)
             # Not in a GIT repository.
             last;
         }
-        elsif (/^\s*git-svn-id:.*?trunk@([0-9]+)\s+/)
+        elsif (/^\s*git-svn-id:.*?@([0-9]+)\s+/)
         {
             $id = $1;
             last;
@@ -59,7 +59,7 @@ sub DetectRevisionId ($)
     open my $proc, "cd $path && svn info 2>\&1 |";
     while (<$proc>)
     {
-        if (/svn: E155007:/)
+        if (/svn: E155007:/ || /svn: '.' is not a working copy/)
         {
             # Not in an SVN repository.
             $id = DetectRevisionIdFromGit($path);

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm Wed Jun 27 13:44:09 2012
@@ -985,7 +985,8 @@ sub replace_setup_variables
 	if ( $hashref->{'USERDIRPRODUCTVERSION'} ) { $userdirproductversion = $hashref->{'USERDIRPRODUCTVERSION'}; }
 	my $productkey = $productname . " " . $productversion;
 
-	my $scsrevision = SvnRevision::DetectRevisionId(File::Spec->catfile($ENV{'SRC_ROOT'}, File::Spec->updir()));
+    my $scsrevision;
+    $scsrevision = "" unless ( $scsrevision = SvnRevision::DetectRevisionId(File::Spec->catfile($ENV{'SRC_ROOT'}, File::Spec->updir())) );
 
 	# string $buildid, which is used to replace the setup variable <buildid>
 	

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/packimages.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/packimages.pl?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/packimages.pl (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/packimages.pl Wed Jun 27 13:44:09 2012
@@ -98,7 +98,7 @@ sub parse_options
                              '-h' => \$opt_help,
                              '-o=s' => \$out_file,
                              '-g=s' => \$global_path,
-			     '-s=s' => \$sort_file,
+                             '-s=s' => \$sort_file,
                              '-m=s' => \$module_path,
                              '-c=s' => \@custom_path_list,
                              '-e=s' => \$custom_path_extended,
@@ -113,6 +113,10 @@ sub parse_options
         usage();
         exit(1);
     }
+
+    # if extra-verbose, set also verbose
+    if ($extra_verbose) { $verbose = 1; }
+
     #define intermediate output file
     $tmp_out_file="$out_file"."$$".$ENV{INPATH};
     # Sanity checks.
@@ -218,22 +222,22 @@ sub find_custom
     my $custom_hash_ref = shift;
     my $keep_back;
     for my $path (@custom_path) {
-	find({ wanted => \&wanted, no_chdir => 0 }, $path);
-	foreach ( @custom_list ) {
-	    if ( /^\Q$path\E\/(.*)$/ ) {
-		$keep_back=$1;
-		if (!defined $custom_hash_ref->{$keep_back}) {
-		    $custom_hash_ref->{$keep_back} = $path;
-		}
-	    }
-	}
+        find({ wanted => \&wanted, no_chdir => 0 }, $path);
+        foreach ( @custom_list ) {
+            if ( /^\Q$path\E\/(.*)$/ ) {
+                $keep_back=$1;
+                if (!defined $custom_hash_ref->{$keep_back}) {
+                    $custom_hash_ref->{$keep_back} = $path;
+                }
+            }
+        }
     }
 }
 
 sub wanted
 {
     my $file = $_;
-    
+
     if ( $file =~ /.*\.png$/ && -f $file ) {
         push @custom_list, $File::Find::name;
     }
@@ -284,14 +288,14 @@ sub is_file_newer 
 {
     my $test_hash_ref = shift;
     my $reference_stamp = 0;
-    
+
     print_message("checking timestamps ...") if $verbose;
     if ( -e $out_file ) {
         $reference_stamp = (stat($out_file))[9];
         print_message("found $out_file with $reference_stamp ...") if $verbose;
     }
     return 1 if $reference_stamp == 0;
-        
+
     foreach ( sort keys %{$test_hash_ref} ) {
         my $path = $test_hash_ref->{$_};
         $path .= "/" if "$path" ne "";
@@ -308,8 +312,8 @@ sub optimize_zip_layout($)
     my $zip_hash_ref = shift;
 
     if (!defined $sort_file) {
-	print_message("no sort file - sorting alphabetically ...") if $verbose;
-	return sort keys %{$zip_hash_ref};
+    print_message("no sort file - sorting alphabetically ...") if $verbose;
+    return sort keys %{$zip_hash_ref};
     }
     print_message("sorting from $sort_file ...") if $verbose;
 
@@ -318,21 +322,21 @@ sub optimize_zip_layout($)
     my @sorted;
     open ($orderh, $sort_file) || die "Can't open $sort_file: $!";
     while (<$orderh>) {
-	/^\#.*/ && next; # comments
-	s/[\r\n]*$//;
-	/^\s*$/ && next;
-	my $file = $_;
-	if (!defined $zip_hash_ref->{$file}) {
-	    print "unknown file '$file'\n" if ($extra_verbose);
-	} else {
-	    push @sorted, $file;
-	    $included{$file} = 1;
-	}
+        /^\#.*/ && next; # comments
+        s/[\r\n]*$//;
+        /^\s*$/ && next;
+        my $file = $_;
+        if (!defined $zip_hash_ref->{$file}) {
+            print "unknown file '$file'\n" if ($extra_verbose);
+        } else {
+            push @sorted, $file;
+            $included{$file} = 1;
+        }
     }
     close ($orderh);
 
     for my $img (sort keys %{$zip_hash_ref}) {
-	push @sorted, $img if (!$included{$img});
+        push @sorted, $img if (!$included{$img});
     }
 
     print_message("done sort ...") if $verbose;

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/srcrelease.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/srcrelease.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/srcrelease.xml Wed Jun 27 13:44:09 2012
@@ -23,7 +23,7 @@
 
   <property name="out.dir" value="."/>
   <property name="aoo.name" value="aoo"/>
-  <property name="aoo.ver" value="3.4.0"/>
+  <property name="aoo.ver" value="3.5.0"/>
   <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
   <property name="release.file.name" value="${release.dir.name}-incubating-src"/>
   <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>

Modified: incubator/ooo/branches/alg/aw080/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/gbuild/platform/os2.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/gbuild/platform/os2.mk Wed Jun 27 13:44:09 2012
@@ -45,6 +45,10 @@ ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
 
+# until we get a solution to libc ticket#251, use dmik's -q option.
+EMXOMFOPT = -q
+export EMXOMFOPT
+
 gb_OSDEFS := \
 	-D$(OS) \
 	-D_PTHREADS \

Modified: incubator/ooo/branches/alg/aw080/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/inc/libs.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/inc/libs.mk Wed Jun 27 13:44:09 2012
@@ -355,7 +355,9 @@ MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
 COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
-SERFLIBS=-lapr-1 -laprutil-1 -lserf-1
+INTERNAL_APR_LIBS=-lapr-1
+INTERNAL_APRUTIL_LIBS=-laprutil-1
+INTERNAL_SERF_LIBS=-lserf-1
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
@@ -526,7 +528,9 @@ HUNSPELLLIB=$(LIBPRE) libhunspell.lib
 MYTHESLIB=libmythes.lib
 PYUNOLIB=ipyuno.lib
 COINMPLIBS=CoinMP.lib
-SERFLIBS=libapr-1.lib iapr-util.lib iserf.lib
+INTERNAL_APR_LIBS=libapr-1.lib
+INTERNAL_APRUTIL_LIBS=iapr-util.lib
+INTERNAL_SERF_LIBS=iserf.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib

Modified: incubator/ooo/branches/alg/aw080/main/solenv/inc/minor.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/inc/minor.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/inc/minor.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/inc/minor.mk Wed Jun 27 13:44:09 2012
@@ -18,8 +18,8 @@
 #  under the License.
 #  
 # *************************************************************
-RSCVERSION=340
-RSCREVISION=340m1(Build:9590)
-BUILD=9590
+RSCVERSION=350
+RSCREVISION=350m1(Build:9610)
+BUILD=9610
 LAST_MINOR=m1
-SOURCEVERSION=AOO340
+SOURCEVERSION=AOO350

Modified: incubator/ooo/branches/alg/aw080/main/solenv/inc/os2gcci.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/inc/os2gcci.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/inc/os2gcci.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/inc/os2gcci.mk Wed Jun 27 13:44:09 2012
@@ -37,6 +37,10 @@
 ASM=as
 AFLAGS=
 
+# until we get a solution to libc ticket#251, use dmik's -q option.
+EMXOMFOPT = -q
+.EXPORT : EMXOMFOPT
+
 #//YD SOLAR_JAVA=TRUE
 JAVAFLAGSDEBUG=-g
 

Modified: incubator/ooo/branches/alg/aw080/main/solenv/inc/tg_ext.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/inc/tg_ext.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/inc/tg_ext.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/inc/tg_ext.mk Wed Jun 27 13:44:09 2012
@@ -159,7 +159,7 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/
 
 #do unpack
 $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
-	$(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
+	$(IFDIREXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) echo "moving" && $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
 	$(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
 	@-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
 	$(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)

Modified: incubator/ooo/branches/alg/aw080/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/inc/unitools.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/inc/unitools.mk Wed Jun 27 13:44:09 2012
@@ -63,6 +63,7 @@ NULLDEV:=/dev/null
 
 # iz29609 helpmacro to check if file exists
 IFEXIST:=if [ -f 
+IFDIREXIST:=if [ -d
 IFNOTEXIST:= if ! test -f
 THEN:= ] ; then
 FI:= ; fi

Modified: incubator/ooo/branches/alg/aw080/main/solenv/inc/version.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/inc/version.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/inc/version.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/inc/version.lst Wed Jun 27 13:44:09 2012
@@ -20,7 +20,7 @@
 #**************************************************************
 
 OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=4
+OOOBASEVERSIONMINOR=5
 OOOBASEVERSIONMICRO=0
 
 OOOBASEVERSIONDAY=1

Modified: incubator/ooo/branches/alg/aw080/main/soltools/inc/st_list.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/soltools/inc/st_list.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/soltools/inc/st_list.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/soltools/inc/st_list.hxx Wed Jun 27 13:44:09 2012
@@ -290,7 +290,7 @@ DynamicList<XY>::operator=( const Dynami
           it != i_rList.end();
           ++it )
     {
-     	push_back( new XY(*(*it)) );
+        this->push_back( new XY(*(*it)) );
     }
     return *this;
 }
@@ -303,7 +303,7 @@ DynamicList<XY>::Insert(unsigned pos, XY
 	if ( pos > this->len )
 	  return;
 
-	checkSize(DynamicList<XY>::len+2);
+	this->checkSize(DynamicList<XY>::len+2);
 	memmove( DynamicList<XY>::inhalt+pos+1, DynamicList<XY>::inhalt+pos, (DynamicList<XY>::len-pos) * sizeof(XY*) );
 	this->inhalt[pos] = elem_;
 	this->len++;

Modified: incubator/ooo/branches/alg/aw080/main/sot/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sot/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sot/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sot/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,8 +21,8 @@
  * 
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:TextStatus" statusbar:align="left" statusbar:width="300" statusbar:helpid="helpid:30367"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="54" statusbar:helpid="helpid:10000"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+ <statusbar:statusbaritem xlink:href=".uno:TextStatus" statusbar:align="left" statusbar:width="300"/>
+ <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
 </statusbar:statusbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/fullscreenbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/fullscreenbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/fullscreenbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/fullscreenbar.xml Wed Jun 27 13:44:09 2012
@@ -23,5 +23,5 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/standardbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/standardbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/standardbar.xml Wed Jun 27 13:44:09 2012
@@ -24,25 +24,25 @@
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SendFax" toolbar:helpid="helpid:20028" toolbar:text="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendFax" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:helpid="helpid:5401" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:text="" toolbar:visible="false" toolbar:helpid="5402"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp"  toolbar:visible="false"/>
 
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/starmath/uiconfig/smath/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,12 +23,12 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ZoomIn" toolbar:helpid="helpid:30266" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ZoomOut" toolbar:helpid="helpid:30267" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:View100" toolbar:helpid="helpid:30264" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Adjust" toolbar:helpid="helpid:30269" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:ZoomIn"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomOut"/>
+ <toolbar:toolbaritem xlink:href=".uno:View100"/>
+ <toolbar:toolbaritem xlink:href=".uno:Adjust"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Draw" toolbar:helpid="helpid:30268" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:FormelCursor" toolbar:helpid="helpid:30271" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolCatalogue" toolbar:helpid="helpid:30261" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Draw"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormelCursor"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolCatalogue"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/svgio/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svgio/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svgio/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svgio/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/svl/inc/svl/poolitem.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/inc/svl/poolitem.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/inc/svl/poolitem.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/inc/svl/poolitem.hxx Wed Jun 27 13:44:09 2012
@@ -199,8 +199,8 @@ private:
 	inline void				 SetKind( sal_uInt16 n );
 public:
 	inline sal_uLong             AddRef( sal_uLong n = 1 ) const;
-private:
 	inline sal_uLong             ReleaseRef( sal_uLong n = 1 ) const;
+private:
 	SVL_DLLPRIVATE long      Delete_Impl(void*);
 
 #if 0

Modified: incubator/ooo/branches/alg/aw080/main/svl/inc/svl/style.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/inc/svl/style.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/inc/svl/style.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/inc/svl/style.hxx Wed Jun 27 13:44:09 2012
@@ -236,7 +236,6 @@ public:
 	SfxItemPool& 				GetPool();
 	const SfxItemPool& 			GetPool() const;
 
-	virtual SfxStyleSheetIterator* CreateIterator(SfxStyleFamily, sal_uInt16 nMask);
 	virtual sal_uInt16 				Count();
 	virtual SfxStyleSheetBase*	operator[](sal_uInt16 nIdx);
 

Modified: incubator/ooo/branches/alg/aw080/main/svl/inc/svl/zformat.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/inc/svl/zformat.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/inc/svl/zformat.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/inc/svl/zformat.hxx Wed Jun 27 13:44:09 2012
@@ -313,6 +313,18 @@ public:
               (eOp1 == NUMBERFORMAT_OP_GT && eOp2 == NUMBERFORMAT_OP_LT) ||
               (eOp1 == NUMBERFORMAT_OP_NO && eOp2 == NUMBERFORMAT_OP_NO) );
         }
+	// Whether the first subformat code is really for negative numbers
+    // or another limit set.
+    sal_Bool IsNegativeRealNegative2() const
+        {
+            return fLimit1 == 0.0 && fLimit2 == 0.0 &&
+            ( (eOp2 == NUMBERFORMAT_OP_GT && eOp1 == NUMBERFORMAT_OP_LT) ||
+			  (eOp2 == NUMBERFORMAT_OP_EQ && eOp1 == NUMBERFORMAT_OP_LT) ||
+			  (eOp2 == NUMBERFORMAT_OP_GE && eOp1 == NUMBERFORMAT_OP_LT) ||
+			  (eOp2 == NUMBERFORMAT_OP_NO && eOp1 == NUMBERFORMAT_OP_LT) ||
+			  (eOp2 == NUMBERFORMAT_OP_NO && eOp1 == NUMBERFORMAT_OP_LE) ||
+			  (eOp2 == NUMBERFORMAT_OP_GT && eOp1 == NUMBERFORMAT_OP_LE));
+        }
 
     // Whether the negative format is without a sign or not
     sal_Bool IsNegativeWithoutSign() const;

Modified: incubator/ooo/branches/alg/aw080/main/svl/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/svl/source/items/itempool.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/source/items/itempool.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/source/items/itempool.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/source/items/itempool.cxx Wed Jun 27 13:44:09 2012
@@ -383,12 +383,22 @@ void SfxItemPool::ReleaseDefaults
 SfxItemPool::~SfxItemPool()
 {
 	DBG_DTOR(SfxItemPool, 0);
-	DBG_ASSERT( pMaster == this, "destroying active Secondary-Pool" );
 
     if ( pImp->ppPoolItems && ppPoolDefaults )
 		Delete();
 	delete[] _pPoolRanges;
 	delete pImp;
+
+    if (pMaster != NULL && pMaster != this)
+    {
+        // This condition indicates an error.  A
+        // pMaster->SetSecondaryPool(...) call should have been made
+        // earlier to prevent this.  At this point we can only try to
+        // prevent a crash later on.
+        DBG_ASSERT( pMaster == this, "destroying active Secondary-Pool" );
+        if (pMaster->pSecondary == this)
+            pMaster->pSecondary = NULL;
+    }
 }
 
 void SfxItemPool::Free(SfxItemPool* pPool)

Modified: incubator/ooo/branches/alg/aw080/main/svl/source/items/style.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/source/items/style.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/source/items/style.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/source/items/style.cxx Wed Jun 27 13:44:09 2012
@@ -578,7 +578,7 @@ SfxStyleSheetIterator& SfxStyleSheetBase
 	if( !rpIter || (rpIter->GetSearchMask() != nMask) || (rpIter->GetSearchFamily() != nSearchFamily) )
 	{
 		delete rpIter;
-		rpIter = CreateIterator( nSearchFamily, nMask );
+		rpIter = new SfxStyleSheetIterator( this, nSearchFamily, nMask );
 	}
 	return *rpIter;
 }
@@ -659,16 +659,6 @@ String SfxStyleSheetBasePool::GetStreamN
 
 
 
-SfxStyleSheetIterator* SfxStyleSheetBasePool::CreateIterator
-(
- SfxStyleFamily eFam,
- sal_uInt16 mask
-)
-{
-	return new SfxStyleSheetIterator(this,eFam,mask);
-}
-
-
 SfxStyleSheetBase* SfxStyleSheetBasePool::Create
 (
 	const XubString& rName,
@@ -797,14 +787,19 @@ void SfxStyleSheetBasePool::Remove( SfxS
 			// Alle Styles umsetzen, deren Parent dieser hier ist
 			ChangeParent( p->GetName(), p->GetParent() );
 
-			com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY );
-			if( xComp.is() ) try
-			{
-				xComp->dispose();
-			}
-			catch( com::sun::star::uno::Exception& )
-			{
-			}
+            // #120015# Do not dispose, the removed StyleSheet may still be used in
+            // existing SdrUndoAttrObj incarnations. Rely on refcounting for disposal,
+            // this works well under normal conditions (checked breaking and counting
+            // on SfxStyleSheetBase constructors and destructors)
+            //
+			// com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY );
+			// if( xComp.is() ) try
+			// {
+			// 	xComp->dispose();
+			// }
+			// catch( com::sun::star::uno::Exception& )
+			// {
+			// }
 
 			aStyles.erase(aIter);
 			Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );

Modified: incubator/ooo/branches/alg/aw080/main/svl/source/numbers/zformat.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/source/numbers/zformat.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/source/numbers/zformat.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/source/numbers/zformat.cxx Wed Jun 27 13:44:09 2012
@@ -1134,6 +1134,18 @@ LanguageType SvNumberformat::ImpGetLangu
         LANGUAGE_DONTKNOW;
 }
 
+sal_Bool IsSingleSymbol(String& rString, xub_StrLen nPos){
+	sal_Bool ret = sal_False;
+	while(nPos > 0){
+		if(rString.GetChar(nPos) == '*' || rString.GetChar(nPos) == '\\' || rString.GetChar(nPos) == '_'){
+			ret = !ret;
+			nPos--;
+		}
+		else
+			return ret;
+	}
+	return ret;
+}
 
 short SvNumberformat::ImpNextSymbol(String& rString,
                                  xub_StrLen& nPos,
@@ -1285,8 +1297,10 @@ short SvNumberformat::ImpNextSymbol(Stri
             break;
             case SsGetString:
             {
-                if (cToken == ';')
+                if (cToken == ';' && (nPos>=2) &&!IsSingleSymbol(rString, nPos-2))
+				{
                     eState = SsStop;
+				}
                 else
                     sSymbol += cToken;
             }
@@ -2129,9 +2143,12 @@ sal_Bool SvNumberformat::GetOutputString
             else
                 nIx = 2;
         }
-        if (nIx == 1 && fNumber < 0.0 &&        // negatives Format
-                IsNegativeRealNegative() )      // ohne Vorzeichen
+        if (nIx == 1 &&          // negatives Format
+                IsNegativeRealNegative() && fNumber < 0.0)      // ohne Vorzeichen
             fNumber = -fNumber;                 // Vorzeichen eliminieren
+		if(nIx == 0 && 
+				IsNegativeRealNegative2() && fNumber < 0.0)
+			fNumber = -fNumber;
         *ppColor = NumFor[nIx].GetColor();
         const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
         const sal_uInt16 nAnz = NumFor[nIx].GetnAnz();

Modified: incubator/ooo/branches/alg/aw080/main/svl/source/undo/undo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svl/source/undo/undo.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svl/source/undo/undo.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svl/source/undo/undo.cxx Wed Jun 27 13:44:09 2012
@@ -620,7 +620,7 @@ bool SfxUndoManager::ImplAddUndoAction_N
     // merge, if required
 	SfxUndoAction* pMergeWithAction = m_pData->pActUndoArray->nCurUndoAction ?
 		m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction : NULL;
-	if ( bTryMerge && ( !pMergeWithAction || !pMergeWithAction->Merge( pAction ) ) )
+	if ( bTryMerge && ( pMergeWithAction && pMergeWithAction->Merge( pAction ) ) )
     {
         i_guard.markForDeletion( pAction );
         return false;

Modified: incubator/ooo/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc Wed Jun 27 13:44:09 2012
@@ -28,9 +28,6 @@
 #define RID_SVTOOLS_BITMAP_START		(RID_SVTOOLS_START + 0)
 #define RID_SVTOOLS_IMAGELIST_START		(RID_SVTOOLS_START + 0)
 
-#define ABOUT_STR_COPYRIGHT             (RID_SVTOOLS_START + 1)
-#define ABOUT_STR_DEVELOPER_ARY         (RID_SVTOOLS_START + 2)
-
 //.............................................................................
 // various unsorted stuff
 

Modified: incubator/ooo/branches/alg/aw080/main/svtools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/filter/exportdialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/filter/exportdialog.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/filter/exportdialog.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/filter/exportdialog.cxx Wed Jun 27 13:44:09 2012
@@ -270,6 +270,10 @@ uno::Sequence< beans::PropertyValue > Ex
 			if ( maCbInterlaced.IsChecked() )
 				nInterlace++;
 			pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nInterlace );
+            sal_Int32 nValue = 0;
+			if ( maCbSaveTransparency.IsChecked() )
+				nValue++;
+			pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), nValue );
 		}
 		break;
 
@@ -930,6 +934,16 @@ void ExportDialog::createFilterOptions( 
 			maNfCompression.SetValue( 9 );
 			maNfCompression.SetStrictFormat( sal_True );
 
+            // transparency
+			xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( &rLayout, nIndent ) );
+			rLayout.addChild( xIndenter );
+			xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, true ) );
+			xIndenter->setChild( xRows );
+			xRows->addWindow( &maCbSaveTransparency );
+		    xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) );
+			rLayout.addChild( xSpacer );
+
+			maCbSaveTransparency.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), 1 ) != 0 );
 			maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ) != 0 );
 		}
 		break;

Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/filter/filter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/filter/filter.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/filter/filter.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/filter/filter.cxx Wed Jun 27 13:44:09 2012
@@ -1943,70 +1943,31 @@ sal_uInt16 GraphicFilter::ExportGraphic(
 				sal_Int32 nVersion = aConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 0 ) ;
 				if ( nVersion )
 					rOStm.SetVersion( nVersion );
-				GDIMetaFile	aMTF;
 
-				if ( eType != GRAPHIC_BITMAP )
-					aMTF = aGraphic.GetGDIMetaFile();
-				else
-				{
-					VirtualDevice aVirDev;
+                // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+				GDIMetaFile aMTF(aGraphic.GetGDIMetaFile());
 
-					aMTF.Record( &aVirDev );
-					aGraphic.Draw( &aVirDev, Point(), aGraphic.GetPrefSize() );
-					aMTF.Stop();
-					aMTF.SetPrefSize( aGraphic.GetPrefSize() );
-					aMTF.SetPrefMapMode( aGraphic.GetPrefMapMode() );
-				}
 				aMTF.Write( rOStm );
-				if( rOStm.GetError() )
+
+                if( rOStm.GetError() )
 					nStatus = GRFILTER_IOERROR;
 			}
 			else if ( aFilterName.EqualsIgnoreCaseAscii( EXP_WMF ) )
 			{
-				if( eType == GRAPHIC_GDIMETAFILE )
-				{
-					if ( !ConvertGDIMetaFileToWMF( aGraphic.GetGDIMetaFile(), rOStm, &aConfigItem ) )
-						nStatus = GRFILTER_FORMATERROR;
-				}
-				else
-				{
-					Bitmap			aBmp( aGraphic.GetBitmap() );
-					GDIMetaFile		aMTF;
-					VirtualDevice	aVirDev;
-
-					aMTF.Record( &aVirDev );
-					aVirDev.DrawBitmap( Point(), aBmp );
-					aMTF.Stop();
-					aMTF.SetPrefSize( aBmp.GetSizePixel() );
+                // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+				if ( !ConvertGDIMetaFileToWMF( aGraphic.GetGDIMetaFile(), rOStm, &aConfigItem ) )
+					nStatus = GRFILTER_FORMATERROR;
 
-					if( !ConvertGDIMetaFileToWMF( aMTF, rOStm, &aConfigItem ) )
-						nStatus = GRFILTER_FORMATERROR;
-				}
-				if( rOStm.GetError() )
+                if( rOStm.GetError() )
 					nStatus = GRFILTER_IOERROR;
 			}
 			else if ( aFilterName.EqualsIgnoreCaseAscii( EXP_EMF ) )
 			{
-				if( eType == GRAPHIC_GDIMETAFILE )
-				{
-					if ( !ConvertGDIMetaFileToEMF( aGraphic.GetGDIMetaFile(), rOStm, &aConfigItem ) )
-						nStatus = GRFILTER_FORMATERROR;
-				}
-				else
-				{
-					Bitmap			aBmp( aGraphic.GetBitmap() );
-					GDIMetaFile		aMTF;
-					VirtualDevice	aVirDev;
-
-					aMTF.Record( &aVirDev );
-					aVirDev.DrawBitmap( Point(), aBmp );
-					aMTF.Stop();
-					aMTF.SetPrefSize( aBmp.GetSizePixel() );
+                // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+				if ( !ConvertGDIMetaFileToEMF( aGraphic.GetGDIMetaFile(), rOStm, &aConfigItem ) )
+					nStatus = GRFILTER_FORMATERROR;
 
-					if( !ConvertGDIMetaFileToEMF( aMTF, rOStm, &aConfigItem ) )
-						nStatus = GRFILTER_FORMATERROR;
-				}
-				if( rOStm.GetError() )
+                if( rOStm.GetError() )
 					nStatus = GRFILTER_IOERROR;
 			}
 			else if( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )
@@ -2121,6 +2082,8 @@ sal_uInt16 GraphicFilter::ExportGraphic(
                                     SvMemoryStream aMemStm( 65535, 65535 );
 
                                     aMemStm.SetCompressMode( COMPRESSMODE_FULL );
+                                    
+                                    // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
                                     ( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( aMemStm );
 
                                     xActiveDataSource->setOutputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >(



Mime
View raw message