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

move ImageList to framework

Browse Source 
this can probably be replaced by a std::*map<Image>

Change-Id: Ic36c5f406f5ea51cb9ff135858e319e0877179c7
This commit is contained in:
Caolán McNamara 2017-01-05 14:09:17 +00:00
parent 4f5cd607e3
commit 3cd39b91f8
8 changed files with 71 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/Library_fwk.mk
View File

@ -114,6 +114,9 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/services/taskcreatorsrv \
framework/source/services/urltransformer \
framework/source/uiconfiguration/CommandImageResolver \
framework/source/uiconfiguration/ImageArrayData \
framework/source/uiconfiguration/ImageList \
framework/source/uiconfiguration/ImplImageList \
framework/source/uiconfiguration/globalsettings \
framework/source/uiconfiguration/graphicnameaccess \
framework/source/uiconfiguration/imagemanager \

2
vcl/source/image/ImageArrayData.cxx → framework/source/uiconfiguration/ImageArrayData.cxx
View File

@ -35,8 +35,6 @@
#include <rtl/strbuf.hxx>
#endif
#include "BitmapProcessor.hxx"
ImageAryData::ImageAryData( const ImageAryData& rData ) :
maName( rData.maName ),
mnId( rData.mnId ),

0
vcl/source/image/ImageList.cxx → framework/source/uiconfiguration/ImageList.cxx
View File

0
vcl/source/image/ImplImageList.cxx → framework/source/uiconfiguration/ImplImageList.cxx
View File

67
framework/source/uiconfiguration/image.h Normal file
View File

@ -0,0 +1,67 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef FRAMEWORK_SOURCE_UICONFIGURATION_IMAGE_H
#define FRAMEWORK_SOURCE_UICONFIGURATION_IMAGE_H
#include <vcl/bitmapex.hxx>
#include <unordered_map>
#include <vector>
struct ImageAryData
{
OUString maName;
// Images identified by either name, or by id
sal_uInt16 mnId;
BitmapEx maBitmapEx;
ImageAryData( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmap );
ImageAryData( const ImageAryData& rData );
~ImageAryData();
bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); }
void Load(const OUString &rPrefix);
ImageAryData& operator=( const ImageAryData& rData );
};
struct ImplImageList
{
typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
ImageAryDataNameHash;
std::vector<ImageAryData *> maImages;
ImageAryDataNameHash maNameHash;
OUString maPrefix;
Size maImageSize;
ImplImageList();
ImplImageList( const ImplImageList &aSrc );
~ImplImageList();
void AddImage( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmapEx );
void RemoveImage( sal_uInt16 nPos );
};
#endif // INCLUDED_VCL_INC_IMAGE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
include/vcl/ImageTree.hxx
View File

@ -54,7 +54,7 @@ public:
VCL_DLLPUBLIC OUString getImageUrl(
OUString const & name, OUString const & style, OUString const & lang);
bool loadImage(
VCL_DLLPUBLIC bool loadImage(
OUString const & name, OUString const & style,
BitmapEx & bitmap, bool localized,
const ImageLoadFlags eFlags = ImageLoadFlags::NONE);

3
vcl/Library_vcl.mk
View File

@ -312,12 +312,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/bitmap/BitmapTools \
vcl/source/bitmap/checksum \
vcl/source/image/Image \
vcl/source/image/ImageArrayData \
vcl/source/image/ImageList \
vcl/source/image/ImageTree \
vcl/source/image/ImageRepository \
vcl/source/image/ImplImage \
vcl/source/image/ImplImageList \
vcl/source/image/ImplImageTree \
vcl/source/helper/canvasbitmap \
vcl/source/helper/canvastools \

37
vcl/inc/image.h
View File

@ -25,43 +25,6 @@
#include <unordered_map>
#include <vector>
struct ImageAryData
{
OUString maName;
// Images identified by either name, or by id
sal_uInt16 mnId;
BitmapEx maBitmapEx;
ImageAryData( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmap );
ImageAryData( const ImageAryData& rData );
~ImageAryData();
bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); }
void Load(const OUString &rPrefix);
ImageAryData& operator=( const ImageAryData& rData );
};
struct ImplImageList
{
typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
ImageAryDataNameHash;
std::vector<ImageAryData *> maImages;
ImageAryDataNameHash maNameHash;
OUString maPrefix;
Size maImageSize;
ImplImageList();
ImplImageList( const ImplImageList &aSrc );
~ImplImageList();
void AddImage( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmapEx );
void RemoveImage( sal_uInt16 nPos );
};
struct ImplImage
{
BitmapChecksum maBitmapChecksum;