CWS-TOOLING: integrate CWS jl152

basctl/source/basicide/scriptdocument.cxx

@@ -1016,8 +1016,11 @@ namespace basctl
 
                 ::rtl::OUString aSearchURL1( RTL_CONSTASCII_USTRINGPARAM( "share/basic" ) );
                 ::rtl::OUString aSearchURL2( RTL_CONSTASCII_USTRINGPARAM( "share/uno_packages" ) );
-                if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 || aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 )
-                    bIsShared = true;
+                ::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM( "share/extensions" ) );
+                if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 ||
+                    aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ||
+                    aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
+                        bIsShared = true;
             }
         }
         catch( const Exception& )

extensions/source/update/check/updatecheck.cxx

@@ -865,6 +865,9 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
 
 
                 m_aUpdateInfo = UpdateInfo();
+                // Remove outdated release notes
+                storeReleaseNote( 1, rtl::OUString() );
+                storeReleaseNote( 2, rtl::OUString() );
             }
             else
             {

setup_native/source/win32/customactions/languagepacks/exports.dxp

@@ -2,6 +2,3 @@ SetProductInstallationPath
 RegisterLanguagePack
 GetUserInstallMode    
 IsOfficeRunning
-RegisterExtensions
-DeregisterExtensions
-RemoveExtensions

setup_native/source/win32/customactions/languagepacks/makefile.mk

@@ -77,7 +77,6 @@ STDSHL+=	\
 #SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
 SHL1OBJS = $(SLOFILES)              \
-    $(SLO)$/registerextensions.obj  \
     $(SLO)$/seterror.obj
 
 SHL1TARGET = $(TARGET)

setup_native/source/win32/customactions/patch/exports.dxp

@@ -7,6 +7,3 @@ IsOfficeRunning
 SetFeatureState
 SetNewFeatureState
 ShowOnlineUpdateDialog
-RegisterExtensions
-DeregisterExtensions
-RemoveExtensions

setup_native/source/win32/customactions/patch/makefile.mk

@@ -76,7 +76,6 @@ SHL1OBJS = $(SLOFILES)               \
     $(SLO)$/shutdown_quickstart.obj  \
     $(SLO)$/quickstarter.obj         \
     $(SLO)$/upgrade.obj              \
-    $(SLO)$/registerextensions.obj   \
     $(SLO)$/seterror.obj
 
 SHL1TARGET = $(TARGET)

setup_native/source/win32/customactions/shellextensions/exports.dxp

@@ -6,9 +6,6 @@ SetProductInstallMode
 RebuildShellIconCache
 ExecutePostUninstallScript
 MigrateInstallPath
-RegisterExtensions
-DeregisterExtensions
-RemoveExtensions
 CheckInstallDirectory
 SetAdminInstallProperty
 CreateLayerLinks

setup_native/source/win32/customactions/shellextensions/makefile.mk

@@ -62,7 +62,6 @@ SLOFILES = \
     $(SLO)$/setadmininstall.obj \
     $(SLO)$/layerlinks.obj \
     $(SLO)$/dotnetcheck.obj \
-    $(SLO)$/registerextensions.obj \
     $(SLO)$/copyeditiondata.obj \
     $(SLO)$/vistaspecial.obj \
     $(SLO)$/checkrunningoffice.obj \