updateprotocol.cxx (2a97ec55) | updateprotocol.cxx (910823ae) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 52 unchanged lines hidden (view full) --- 61 ::rtl::OUString & rBuildID, 62 ::rtl::OUString & rInstallSetID) 63{ 64 rBuildID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" ); 65 rtl::Bootstrap::expandMacros( rBuildID ); 66 if ( ! rBuildID.getLength() ) 67 return false; 68 | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 52 unchanged lines hidden (view full) --- 61 ::rtl::OUString & rBuildID, 62 ::rtl::OUString & rInstallSetID) 63{ 64 rBuildID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" ); 65 rtl::Bootstrap::expandMacros( rBuildID ); 66 if ( ! rBuildID.getLength() ) 67 return false; 68 |
69 rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" ); | 69 rInstallSetID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" ); |
70 rtl::Bootstrap::expandMacros( rInstallSetID ); 71 if ( ! rInstallSetID.getLength() ) 72 return false; 73 | 70 rtl::Bootstrap::expandMacros( rInstallSetID ); 71 if ( ! rInstallSetID.getLength() ) 72 return false; 73 |
74 rtl::OUString aValue( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) ); | 74 rtl::OUString aValue( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) ); |
75 rtl::Bootstrap::expandMacros( aValue ); 76 77 if( aValue.getLength() > 0 ) 78 { 79 rRepositoryList.realloc(1); 80 rRepositoryList[0] = aValue; 81 } 82 --- 249 unchanged lines hidden --- | 75 rtl::Bootstrap::expandMacros( aValue ); 76 77 if( aValue.getLength() > 0 ) 78 { 79 rRepositoryList.realloc(1); 80 rRepositoryList[0] = aValue; 81 } 82 --- 249 unchanged lines hidden --- |