mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There is no images*_brand.zip files

Browse Source 
Change-Id: I6ddeff7ae72693fd0951d71bd7b5444938bc7286
This commit is contained in:
Stephan Bergmann 2013-04-29 18:38:12 +02:00
parent d7ebca515a
commit 8b324e21f2
5 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postprocess/CustomTarget_images.mk
View File

@ -35,7 +35,6 @@ helpimages_DIR := $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxilia
packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c $(SRCDIR)/icon-themes/industrial
$(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
images_brand.zip \
$(if $(filter default,$(WITH_THEMES)),images.zip) \
$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
commandimagelist.ilst \
@ -68,11 +67,6 @@ $(packimages_DIR)/%.zip : \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
# make sure to have one to keep packing happy
$(packimages_DIR)/images_brand.zip :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2)
touch $@
# commandimagelist.ilst and sorted.lst are phony to rebuild everything each time
.PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst

2
postprocess/Package_images.mk
View File

@ -27,8 +27,6 @@
$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
$(eval $(call gb_Package_add_file,postprocess_images,bin/images_brand.zip,images_brand.zip))
$(if $(filter default,$(WITH_THEMES)),\
$(eval $(call gb_Package_add_file,postprocess_images,bin/images.zip,images.zip)))

1
postprocess/Package_images_install.mk
View File

@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,postprocess_images_install,$(call gb_CustomTarg
$(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR)))
$(eval $(call gb_Package_add_files,postprocess_images_install,share/config,\
images_brand.zip \
$(if $(filter default,$(WITH_THEMES)),images.zip) \
$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
))

8
scp2/source/ooo/common_brand.scp
View File

@ -61,7 +61,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAboutShell,
gid_Brand_File_Html_Thirdpartylicensereadme,
gid_Brand_File_Images_Brand_Zip,
gid_Brand_File_Lib_Dbghelp,
gid_Brand_File_Lib_Mingw_GccS,
gid_Brand_File_Lib_Mingw_Stdcpp,
@ -619,13 +618,6 @@ File gid_Brand_File_Bmp_IntroAboutShell
Styles = (ARCHIVE);
End
File gid_Brand_File_Images_Brand_Zip
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Config;
Name = "images_brand.zip";
Styles = (PACKED);
End
File gid_Brand_File_Txt_Package
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Extensions;

54
vcl/source/gdi/impimagetree.cxx
View File

@ -163,26 +163,22 @@ bool ImplImageTree::checkStyle(OUString const & style)
setStyle(style);
exists = false;
const OUString sBrandURLSuffix("_brand");
for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; ++i) {
OUString aURL = i->first;
sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength();
// skip brand-specific icon themes; they are incomplete and thus not useful for this check
if (nFromIndex < 0 || !aURL.match(sBrandURLSuffix, nFromIndex)) {
osl::File aZip(aURL + ".zip");
if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) {
aZip.close();
exists = true;
}
osl::Directory aLookaside(aURL);
if (aLookaside.open() == ::osl::FileBase::E_None) {
aLookaside.close();
exists = true;
m_cacheIcons = false;
} else {
m_cacheIcons = true;
}
osl::File aZip(aURL + ".zip");
if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) {
aZip.close();
exists = true;
}
osl::Directory aLookaside(aURL);
if (aLookaside.open() == ::osl::FileBase::E_None) {
aLookaside.close();
exists = true;
m_cacheIcons = false;
} else {
m_cacheIcons = true;
}
}
m_checkStyleCache[style] = exists;
@ -277,30 +273,6 @@ void ImplImageTree::setStyle(OUString const & style) {
void ImplImageTree::resetPaths() {
m_paths.clear();
{
OUString url(
"$BRAND_BASE_DIR/share/config");
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
OUStringBuffer b;
b.appendAscii("images_");
b.append(m_style);
b.appendAscii("_brand");
bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
m_paths.push_back(
std::make_pair(
u.GetMainURL(INetURLObject::NO_DECODE),
css::uno::Reference< css::container::XNameAccess >()));
}
{
OUString url( "$BRAND_BASE_DIR/share/config/images_brand");
rtl::Bootstrap::expandMacros(url);
m_paths.push_back(
std::make_pair(
url, css::uno::Reference< css::container::XNameAccess >()));
}
{
OUString url(
"$BRAND_BASE_DIR/share/config");