1. mst
  2. ooo340

Commits

kz  committed 0511ba4

CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF

  • Participants
  • Parent commits 38e8b42
  • Branches default

Comments (0)

Files changed (4)

File setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx

View file
  • Ignore whitespace
 //    MessageBox(NULL, sRenameSrc.c_str(), "OFFICEINSTALLLOCATION", MB_OK);
 
     bool bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
+    if ( !bSuccess )
+    {
+        TCHAR sAppend[2] = TEXT("0");
+        for ( int i = 0; i < 10; i++ )
+        {
+            sRenameDst = sOfficeInstallPath + TEXT("program_old") + sAppend;
+            bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
+            if ( bSuccess )
+                break;
+            sAppend[0] += 1;
+        }
+    }
 
 #if 0
     if ( !bSuccess )
     
     bool bSuccess = RemoveCompleteDirectory( sRemoveDir );
 
+    TCHAR sAppend[2] = TEXT("0");
+    for ( int i = 0; i < 10; i++ )
+    {
+        sRemoveDir = sOfficeInstallPath + TEXT("program_old") + sAppend;
+        bSuccess = RemoveCompleteDirectory( sRemoveDir );
+        sAppend[0] += 1;
+    }
+
 #if 0
     if ( bSuccess )
         MessageBox(NULL, "Removing folder successful", "RemovePrgFolder", MB_OK);

File solenv/inc/_tg_app.mk

View file
  • Ignore whitespace
 .IF "$(APP1TARGETN)"!=""
 
 .IF "$(APP1PRODUCTNAME)"!=""
-APP1PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
+APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
 .ENDIF			# "$(APP1PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP2TARGETN)"!=""
 
 .IF "$(APP2PRODUCTNAME)"!=""
-APP2PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
+APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
 .ENDIF			# "$(APP2PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP3TARGETN)"!=""
 
 .IF "$(APP3PRODUCTNAME)"!=""
-APP3PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
+APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
 .ENDIF			# "$(APP3PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP4TARGETN)"!=""
 
 .IF "$(APP4PRODUCTNAME)"!=""
-APP4PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
+APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
 .ENDIF			# "$(APP4PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP5TARGETN)"!=""
 
 .IF "$(APP5PRODUCTNAME)"!=""
-APP5PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
+APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
 .ENDIF			# "$(APP5PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP6TARGETN)"!=""
 
 .IF "$(APP6PRODUCTNAME)"!=""
-APP6PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
+APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
 .ENDIF			# "$(APP6PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP7TARGETN)"!=""
 
 .IF "$(APP7PRODUCTNAME)"!=""
-APP7PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
+APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
 .ENDIF			# "$(APP7PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP8TARGETN)"!=""
 
 .IF "$(APP8PRODUCTNAME)"!=""
-APP8PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
+APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
 .ENDIF			# "$(APP8PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP9TARGETN)"!=""
 
 .IF "$(APP9PRODUCTNAME)"!=""
-APP9PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
+APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
 .ENDIF			# "$(APP9PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""
 .IF "$(APP10TARGETN)"!=""
 
 .IF "$(APP10PRODUCTNAME)"!=""
-APP10PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
+APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
 .ENDIF			# "$(APP10PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""

File solenv/inc/tg_app.mk

View file
  • Ignore whitespace
 .IF "$(APP$(TNR)TARGETN)"!=""
 
 .IF "$(APP$(TNR)PRODUCTNAME)"!=""
-APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
+APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
 .ENDIF			# "$(APP$(TNR)PRODUCTNAME)"!=""
 
 .IF "$(linkinc)"!=""

File tools/source/fsys/urlobj.cxx

View file
  • Ignore whitespace
 		{ "out", "out://", 0, true, false, false, false, false, false,
 		  false, false },
 		{ "vnd.sun.star.wfs", "vnd.sun.star.wfs://", 0, true, false, false,
-		  false, true, false, true, false },
+		  false, true, true, true, false },
 		{ "vnd.sun.star.hier", "vnd.sun.star.hier:", 0, true, false, false,
 		  false, false, false, true, false },
 		{ "vim", "vim://", 0, true, true, false, true, false, false, true,