localizationmgr.cxx (31598a22) | localizationmgr.cxx (0848378b) |
---|---|
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 --- 169 unchanged lines hidden (view full) --- 178 const ::rtl::OUString& aPropName, 179 Reference< XStringResourceManager > xStringResourceManager ) 180{ 181 sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); 182 ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); 183 aPureIdStr += aDot; 184 aPureIdStr += aDialogName; 185 aPureIdStr += aDot; | 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 --- 169 unchanged lines hidden (view full) --- 178 const ::rtl::OUString& aPropName, 179 Reference< XStringResourceManager > xStringResourceManager ) 180{ 181 sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); 182 ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); 183 aPureIdStr += aDot; 184 aPureIdStr += aDialogName; 185 aPureIdStr += aDot; |
186 if( aCtrlName.getLength() ) | 186 if( !aCtrlName.isEmpty() ) |
187 { 188 aPureIdStr += aCtrlName; 189 aPureIdStr += aDot; 190 } 191 aPureIdStr += aPropName; 192 return aPureIdStr; 193} 194 --- 43 unchanged lines hidden (view full) --- 238 { 239 Any aPropAny = xPropertySet->getPropertyValue( aPropName ); 240 ::rtl::OUString aPropStr; 241 aPropAny >>= aPropStr; 242 243 // Replace string by id, add id+string to StringResource 244 if( eMode == SET_IDS ) 245 { | 187 { 188 aPureIdStr += aCtrlName; 189 aPureIdStr += aDot; 190 } 191 aPureIdStr += aPropName; 192 return aPureIdStr; 193} 194 --- 43 unchanged lines hidden (view full) --- 238 { 239 Any aPropAny = xPropertySet->getPropertyValue( aPropName ); 240 ::rtl::OUString aPropStr; 241 aPropAny >>= aPropStr; 242 243 // Replace string by id, add id+string to StringResource 244 if( eMode == SET_IDS ) 245 { |
246 bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' ); | 246 bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' ); |
247 if( bEscAlreadyExisting ) 248 continue; 249 250 ::rtl::OUString aPureIdStr = implCreatePureResourceId 251 ( aDialogName, aCtrlName, aPropName, xStringResourceManager ); 252 253 // Set Id for all locales 254 const Locale* pLocales = aLocaleSeq.getConstArray(); --- 176 unchanged lines hidden (view full) --- 431 aIdStrBase += aDot; 432 aIdStrBase += aPropName; 433 434 const Locale* pLocales = aLocaleSeq.getConstArray(); 435 sal_Int32 i; 436 for ( i = 0; i < nPropStringCount; ++i ) 437 { 438 ::rtl::OUString aPropStr = pPropStrings[i]; | 247 if( bEscAlreadyExisting ) 248 continue; 249 250 ::rtl::OUString aPureIdStr = implCreatePureResourceId 251 ( aDialogName, aCtrlName, aPropName, xStringResourceManager ); 252 253 // Set Id for all locales 254 const Locale* pLocales = aLocaleSeq.getConstArray(); --- 176 unchanged lines hidden (view full) --- 431 aIdStrBase += aDot; 432 aIdStrBase += aPropName; 433 434 const Locale* pLocales = aLocaleSeq.getConstArray(); 435 sal_Int32 i; 436 for ( i = 0; i < nPropStringCount; ++i ) 437 { 438 ::rtl::OUString aPropStr = pPropStrings[i]; |
439 bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' ); | 439 bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' ); |
440 if( bEscAlreadyExisting ) 441 { 442 pIdStrings[i] = aPropStr; 443 continue; 444 } 445 446 sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); 447 ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); --- 775 unchanged lines hidden --- | 440 if( bEscAlreadyExisting ) 441 { 442 pIdStrings[i] = aPropStr; 443 continue; 444 } 445 446 sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); 447 ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); --- 775 unchanged lines hidden --- |