| impimagetree.cxx (45fd3b9a) | impimagetree.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 --- 201 unchanged lines hidden (view full) --- 210 m_iconCache.clear(); 211 } 212} 213 214void ImplImageTree::resetZips() { 215 m_zips.clear(); 216 { 217 rtl::OUString url( | 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 --- 201 unchanged lines hidden (view full) --- 210 m_iconCache.clear(); 211 } 212} 213 214void ImplImageTree::resetZips() { 215 m_zips.clear(); 216 { 217 rtl::OUString url( |
| 218 RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition/images.zip")); | 218 RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/edition/images.zip")); |
| 219 rtl::Bootstrap::expandMacros(url); 220 INetURLObject u(url); 221 OSL_ASSERT(!u.HasError()); 222 m_zips.push_back( 223 std::make_pair( 224 u.GetMainURL(INetURLObject::NO_DECODE), 225 css::uno::Reference< css::container::XNameAccess >())); 226 } 227 { 228 rtl::OUString url( | 219 rtl::Bootstrap::expandMacros(url); 220 INetURLObject u(url); 221 OSL_ASSERT(!u.HasError()); 222 m_zips.push_back( 223 std::make_pair( 224 u.GetMainURL(INetURLObject::NO_DECODE), 225 css::uno::Reference< css::container::XNameAccess >())); 226 } 227 { 228 rtl::OUString url( |
| 229 RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config")); | 229 RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config")); |
| 230 rtl::Bootstrap::expandMacros(url); 231 INetURLObject u(url); 232 OSL_ASSERT(!u.HasError()); 233 rtl::OUStringBuffer b; 234 b.appendAscii(RTL_CONSTASCII_STRINGPARAM("images_")); 235 b.append(m_style); 236 b.appendAscii(RTL_CONSTASCII_STRINGPARAM("_brand.zip")); 237 bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); 238 OSL_ASSERT(ok); (void) ok; 239 m_zips.push_back( 240 std::make_pair( 241 u.GetMainURL(INetURLObject::NO_DECODE), 242 css::uno::Reference< css::container::XNameAccess >())); 243 } 244 { 245 rtl::OUString url( 246 RTL_CONSTASCII_USTRINGPARAM( | 230 rtl::Bootstrap::expandMacros(url); 231 INetURLObject u(url); 232 OSL_ASSERT(!u.HasError()); 233 rtl::OUStringBuffer b; 234 b.appendAscii(RTL_CONSTASCII_STRINGPARAM("images_")); 235 b.append(m_style); 236 b.appendAscii(RTL_CONSTASCII_STRINGPARAM("_brand.zip")); 237 bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); 238 OSL_ASSERT(ok); (void) ok; 239 m_zips.push_back( 240 std::make_pair( 241 u.GetMainURL(INetURLObject::NO_DECODE), 242 css::uno::Reference< css::container::XNameAccess >())); 243 } 244 { 245 rtl::OUString url( 246 RTL_CONSTASCII_USTRINGPARAM( |
| 247 "$BRAND_BASE_DIR/share/config/images_brand.zip")); | 247 "$OOO_BASE_DIR/share/config/images_brand.zip")); |
| 248 rtl::Bootstrap::expandMacros(url); 249 m_zips.push_back( 250 std::make_pair( 251 url, css::uno::Reference< css::container::XNameAccess >())); 252 } 253 { 254 rtl::OUString url( 255 RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config")); --- 92 unchanged lines hidden --- | 248 rtl::Bootstrap::expandMacros(url); 249 m_zips.push_back( 250 std::make_pair( 251 url, css::uno::Reference< css::container::XNameAccess >())); 252 } 253 { 254 rtl::OUString url( 255 RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config")); --- 92 unchanged lines hidden --- |