Skip to content

C
core
Kaydet (Commit) 816190b7 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

remove extensions bitmaps from .src files 

resulting in the removal of a updchk .res file

Change-Id: I7a6f3601f25763253ba34590a1970ca8a042db23
üst 7df94869
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 386 deletions
Repository.mk
Dosyayı görüntüle @ 816190b7
...@@ -1100,7 +1100,6 @@ $(eval $(call gb_Helper_register_resources,\ ...@@ -1100,7 +1100,6 @@ $(eval $(call gb_Helper_register_resources,\
t602filter \ t602filter \
tpl \ tpl \
upd \ upd \
$(if $(ENABLE_ONLINE_UPDATE),updchk) \
uui \ uui \
vcl \ vcl \
writerperfect \ writerperfect \
......
extensions/AllLangResTarget_bib.mk
Dosyayı görüntüle @ 816190b7
...@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_set_include,bib/res,\ ...@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_set_include,bib/res,\
$(eval $(call gb_SrsTarget_add_files,bib/res,\ $(eval $(call gb_SrsTarget_add_files,bib/res,\
extensions/source/bibliography/bib.src \ extensions/source/bibliography/bib.src \
extensions/source/bibliography/sections.src \ extensions/source/bibliography/sections.src \
extensions/source/bibliography/toolbar.src \
)) ))
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:
extensions/AllLangResTarget_updchk.mk deleted 100644 → 0
Dosyayı görüntüle @ 7df94869
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
#
# 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/.
#
#
$(eval $(call gb_AllLangResTarget_AllLangResTarget,updchk))
$(eval $(call gb_AllLangResTarget_set_reslocation,updchk,extensions/source/update/ui))
$(eval $(call gb_AllLangResTarget_add_srs,updchk,\
updchk/res \
))
$(eval $(call gb_SrsTarget_SrsTarget,updchk/res))
$(eval $(call gb_SrsTarget_add_nonlocalizable_files,updchk/res,\
extensions/source/update/ui/updatecheckui.src \
))
# vim:set noet sw=4 ts=4:
extensions/Library_updatecheckui.mk
Dosyayı görüntüle @ 816190b7
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
$(eval $(call gb_Library_Library,updatecheckui)) $(eval $(call gb_Library_Library,updatecheckui))
$(eval $(call gb_Library_set_include,updatecheckui,\
-I$(SRCDIR)/extensions/inc \
$$(INCLUDE) \
))
$(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk)) $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
$(eval $(call gb_Library_use_external,updatecheckui,boost_headers)) $(eval $(call gb_Library_use_external,updatecheckui,boost_headers))
......
extensions/Module_extensions.mk
Dosyayı görüntüle @ 816190b7
...@@ -56,9 +56,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ ...@@ -56,9 +56,6 @@ $(eval $(call gb_Module_add_targets,extensions,\
Library_updatecheckui \ Library_updatecheckui \
Library_updchk \ Library_updchk \
)) ))
$(eval $(call gb_Module_add_l10n_targets,extensions,\
AllLangResTarget_updchk \
))
$(eval $(call gb_Module_add_check_targets,extensions,\ $(eval $(call gb_Module_add_check_targets,extensions,\
CppunitTest_extensions_test_update \ CppunitTest_extensions_test_update \
......
extensions/inc/bitmaps.hlst 0 → 100644
Dosyayı görüntüle @ 816190b7
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* 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/.
*/
#ifndef INCLUDED_EXTENSIONS_INC_BITMAPS_HRC
#define INCLUDED_EXTENSIONS_INC_BITMAPS_HRC
#define RID_EXTBMP_CONTROL "res/sx10144.png"
#define RID_EXTBMP_BUTTON "res/sx10594.png"
#define RID_EXTBMP_RADIOBUTTON "res/sx10595.png"
#define RID_EXTBMP_CHECKBOX "res/sx10596.png"
#define RID_EXTBMP_FIXEDTEXT "res/sx10597.png"
#define RID_EXTBMP_GROUPBOX "res/sx10598.png"
#define RID_EXTBMP_EDITBOX "res/sx10599.png"
#define RID_EXTBMP_LISTBOX "res/sx10600.png"
#define RID_EXTBMP_COMBOBOX "res/sx10601.png"
#define RID_EXTBMP_GRID "res/sx10603.png"
#define RID_EXTBMP_IMAGEBUTTON "res/sx10604.png"
#define RID_EXTBMP_FILECONTROL "res/sx10605.png"
#define RID_EXTBMP_DATEFIELD "res/sx10704.png"
#define RID_EXTBMP_TIMEFIELD "res/sx10705.png"
#define RID_EXTBMP_NUMERICFIELD "res/sx10706.png"
#define RID_EXTBMP_CURRENCYFIELD "res/sx10707.png"
#define RID_EXTBMP_PATTERNFIELD "res/sx10708.png"
#define RID_EXTBMP_IMAGECONTROL "res/sx10710.png"
#define RID_EXTBMP_HIDDEN "res/sx18022.png"
#define RID_EXTBMP_FORMATTEDFIELD "res/sx10728.png"
#define RID_EXTBMP_FILTER "res/sx10715.png"
#define RID_EXTBMP_FORMS "res/sx18013.png"
#define RID_EXTBMP_FORM "res/sx10593.png"
#define RID_EXTBMP_COLLAPSEDNODE "res/sx18002.png"
#define RID_EXTBMP_EXPANDEDNODE "res/sx18003.png"
#define RID_EXTBMP_SCROLLBAR "res/sx10768.png"
#define RID_EXTBMP_SPINBUTTON "res/sx10769.png"
#define RID_EXTBMP_NAVIGATIONBAR "res/sx10607.png"
#define RID_UPDATE_AVAILABLE_16 "extensions/source/update/ui/onlineupdate_16.png"
#define RID_UPDATE_AVAILABLE_26 "extensions/source/update/ui/onlineupdate_26.png"
#define BMP_TABLE "res/sx03188.png"
#define BMP_QUERY "res/sx03202.png"
#define RID_EXTBMP_AUTOFILTER_SC "res/sc10716.png"
#define RID_EXTBMP_FILTERCRIT_SC "res/sc10715.png"
#define RID_EXTBMP_REMOVE_FILTER_SORT_SC "res/sc10711.png"
#define RID_EXTBMP_AUTOFILTER_LC "res/lc10716.png"
#define RID_EXTBMP_FILTERCRIT_LC "res/lc10715.png"
#define RID_EXTBMP_REMOVE_FILTER_SORT_LC "res/lc10711.png"
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
extensions/source/bibliography/bib.hrc
Dosyayı görüntüle @ 816190b7
...@@ -25,15 +25,6 @@ ...@@ -25,15 +25,6 @@
#define RID_BIB_START RID_EXTENSIONS_START #define RID_BIB_START RID_EXTENSIONS_START
#endif #endif
//Bitmaps(100)
#define RID_BIB_IMAGES (RID_BIB_START + 100)
#define RID_EXTBMP_AUTOFILTER_SC (RID_BIB_IMAGES + 1)
#define RID_EXTBMP_FILTERCRIT_SC (RID_BIB_IMAGES + 2)
#define RID_EXTBMP_REMOVE_FILTER_SORT_SC (RID_BIB_IMAGES + 3)
#define RID_EXTBMP_AUTOFILTER_LC (RID_BIB_IMAGES + 4)
#define RID_EXTBMP_FILTERCRIT_LC (RID_BIB_IMAGES + 5)
#define RID_EXTBMP_REMOVE_FILTER_SORT_LC (RID_BIB_IMAGES + 6)
// Strings (500) // Strings (500)
#define RID_BIB_STRING (RID_BIB_START + 200) #define RID_BIB_STRING (RID_BIB_START + 200)
#define RID_BIB_STR_NONE (RID_BIB_STRING + 1) #define RID_BIB_STR_NONE (RID_BIB_STRING + 1)
......
extensions/source/bibliography/toolbar.cxx
Dosyayı görüntüle @ 816190b7
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "bibview.hxx" #include "bibview.hxx"
#include "bibresid.hxx" #include "bibresid.hxx"
#include "bib.hrc" #include "bib.hrc"
#include "bitmaps.hlst"
#include "bibtools.hxx" #include "bibtools.hxx"
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
...@@ -573,9 +574,9 @@ void BibToolBar::RebuildToolbar() ...@@ -573,9 +574,9 @@ void BibToolBar::RebuildToolbar()
void BibToolBar::ApplyImageList() void BibToolBar::ApplyImageList()
{ {
SetItemImage(nTBC_BT_AUTOFILTER, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_AUTOFILTER_SC : RID_EXTBMP_AUTOFILTER_LC)))); SetItemImage(nTBC_BT_AUTOFILTER, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC))));
SetItemImage(nTBC_BT_FILTERCRIT, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_FILTERCRIT_SC : RID_EXTBMP_FILTERCRIT_LC)))); SetItemImage(nTBC_BT_FILTERCRIT, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC))));
SetItemImage(nTBC_BT_REMOVEFILTER, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_REMOVE_FILTER_SORT_SC : RID_EXTBMP_REMOVE_FILTER_SORT_LC)))); SetItemImage(nTBC_BT_REMOVEFILTER, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC))));
AdjustToolBox(); AdjustToolBox();
} }
......
extensions/source/bibliography/toolbar.src deleted 100644 → 0
Dosyayı görüntüle @ 7df94869
/* -*- 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 .
*/
#include <svx/svxids.hrc>
#include "bibliography.hrc"
#include "svx/svxcommands.h"
#include "bib.hrc"
Bitmap RID_EXTBMP_AUTOFILTER_SC
{
File = "sc10716.png";
};
Bitmap RID_EXTBMP_FILTERCRIT_SC
{
File = "sc10715.png";
};
Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_SC
{
File = "sc10711.png";
};
Bitmap RID_EXTBMP_AUTOFILTER_LC
{
File = "lc10716.png";
};
Bitmap RID_EXTBMP_FILTERCRIT_LC
{
File = "lc10715.png";
};
Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_LC
{
File = "lc10711.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
extensions/source/dbpilots/commonpagesdbp.cxx
Dosyayı görüntüle @ 816190b7
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "commonpagesdbp.hxx" #include "commonpagesdbp.hxx"
#include "dbpresid.hrc" #include "dbpresid.hrc"
#include "bitmaps.hlst"
#include "componentmodule.hxx" #include "componentmodule.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdb/XCompletedConnection.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp>
...@@ -361,8 +362,8 @@ namespace dbp ...@@ -361,8 +362,8 @@ namespace dbp
return; return;
} }
Image aTableImage(BitmapEx(ModuleRes(BMP_TABLE))); Image aTableImage(BitmapEx(BMP_TABLE));
Image aQueryImage(BitmapEx(ModuleRes(BMP_QUERY))); Image aQueryImage(BitmapEx(BMP_QUERY));
lcl_fillEntries( *m_pTable, aTableNames, aTableImage, CommandType::TABLE ); lcl_fillEntries( *m_pTable, aTableNames, aTableImage, CommandType::TABLE );
lcl_fillEntries( *m_pTable, aQueryNames, aQueryImage, CommandType::QUERY ); lcl_fillEntries( *m_pTable, aQueryNames, aQueryImage, CommandType::QUERY );
......
extensions/source/dbpilots/commonpagesdbp.src
Dosyayı görüntüle @ 816190b7
...@@ -19,16 +19,6 @@ ...@@ -19,16 +19,6 @@
#include "dbpresid.hrc" #include "dbpresid.hrc"
Bitmap BMP_TABLE
{
File = "sx03188.png";
};
Bitmap BMP_QUERY
{
File = "sx03202.png";
};
String RID_STR_OPTION_DB_FIELD_TITLE String RID_STR_OPTION_DB_FIELD_TITLE
{ {
Text [ en-US ] = "Database Field"; Text [ en-US ] = "Database Field";
......
extensions/source/dbpilots/dbpresid.hrc
Dosyayı görüntüle @ 816190b7
...@@ -62,13 +62,6 @@ ...@@ -62,13 +62,6 @@
#error "please adjust the resource id ranges!!" #error "please adjust the resource id ranges!!"
#endif #endif
// local ids
// Image
#define BMP_TABLE ( RID_DIALOG_START + 1 )
#define BMP_QUERY ( RID_DIALOG_START + 2 )
#define WINDOW_SIZE_X 260 #define WINDOW_SIZE_X 260
#define WINDOW_SIZE_Y 185 #define WINDOW_SIZE_Y 185
......
extensions/source/propctrlr/formresid.hrc
Dosyayı görüntüle @ 816190b7
...@@ -309,34 +309,6 @@ ...@@ -309,34 +309,6 @@
#define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 ) #define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 )
#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 ) #define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 )
#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 ) #define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 )
#define RID_EXTBMP_CONTROL ( RID_PROPCONTROLLER_START + 33 )
#define RID_EXTBMP_BUTTON ( RID_PROPCONTROLLER_START + 34 )
#define RID_EXTBMP_RADIOBUTTON ( RID_PROPCONTROLLER_START + 35 )
#define RID_EXTBMP_CHECKBOX ( RID_PROPCONTROLLER_START + 36 )
#define RID_EXTBMP_FIXEDTEXT ( RID_PROPCONTROLLER_START + 37 )
#define RID_EXTBMP_GROUPBOX ( RID_PROPCONTROLLER_START + 38 )
#define RID_EXTBMP_EDITBOX ( RID_PROPCONTROLLER_START + 39 )
#define RID_EXTBMP_LISTBOX ( RID_PROPCONTROLLER_START + 40 )
#define RID_EXTBMP_COMBOBOX ( RID_PROPCONTROLLER_START + 41 )
#define RID_EXTBMP_GRID ( RID_PROPCONTROLLER_START + 42 )
#define RID_EXTBMP_IMAGEBUTTON ( RID_PROPCONTROLLER_START + 43 )
#define RID_EXTBMP_FILECONTROL ( RID_PROPCONTROLLER_START + 44 )
#define RID_EXTBMP_DATEFIELD ( RID_PROPCONTROLLER_START + 45 )
#define RID_EXTBMP_TIMEFIELD ( RID_PROPCONTROLLER_START + 46 )
#define RID_EXTBMP_NUMERICFIELD ( RID_PROPCONTROLLER_START + 47 )
#define RID_EXTBMP_CURRENCYFIELD ( RID_PROPCONTROLLER_START + 48 )
#define RID_EXTBMP_PATTERNFIELD ( RID_PROPCONTROLLER_START + 49 )
#define RID_EXTBMP_IMAGECONTROL ( RID_PROPCONTROLLER_START + 50 )
#define RID_EXTBMP_HIDDEN ( RID_PROPCONTROLLER_START + 51 )
#define RID_EXTBMP_FORMATTEDFIELD ( RID_PROPCONTROLLER_START + 52 )
#define RID_EXTBMP_FILTER ( RID_PROPCONTROLLER_START + 53 )
#define RID_EXTBMP_FORMS ( RID_PROPCONTROLLER_START + 54 )
#define RID_EXTBMP_FORM ( RID_PROPCONTROLLER_START + 55 )
#define RID_EXTBMP_COLLAPSEDNODE ( RID_PROPCONTROLLER_START + 56 )
#define RID_EXTBMP_EXPANDEDNODE ( RID_PROPCONTROLLER_START + 57 )
#define RID_EXTBMP_SCROLLBAR ( RID_PROPCONTROLLER_START + 58 )
#define RID_EXTBMP_SPINBUTTON ( RID_PROPCONTROLLER_START + 59 )
#define RID_EXTBMP_NAVIGATIONBAR ( RID_PROPCONTROLLER_START + 60 )
#endif #endif
......
extensions/source/propctrlr/pcrmiscres.src
Dosyayı görüntüle @ 816190b7
...@@ -24,147 +24,6 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE ...@@ -24,147 +24,6 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
Text [ en-US ] = "Do you want to delete the data type '#type#' from the model?\n" Text [ en-US ] = "Do you want to delete the data type '#type#' from the model?\n"
"Please note that this will affect all controls which are bound to this data type."; "Please note that this will affect all controls which are bound to this data type.";
}; };
Bitmap RID_EXTBMP_CONTROL
{
File = "sx10144.png";
};
Bitmap RID_EXTBMP_BUTTON
{
File = "sx10594.png";
};
Bitmap RID_EXTBMP_RADIOBUTTON
{
File = "sx10595.png";
};
Bitmap RID_EXTBMP_CHECKBOX
{
File = "sx10596.png";
};
Bitmap RID_EXTBMP_FIXEDTEXT
{
File = "sx10597.png";
};
Bitmap RID_EXTBMP_GROUPBOX
{
File = "sx10598.png";
};
Bitmap RID_EXTBMP_EDITBOX
{
File = "sx10599.png";
};
Bitmap RID_EXTBMP_LISTBOX
{
File = "sx10600.png";
};
Bitmap RID_EXTBMP_COMBOBOX
{
File = "sx10601.png";
};
Bitmap RID_EXTBMP_GRID
{
File = "sx10603.png";
};
Bitmap RID_EXTBMP_IMAGEBUTTON
{
File = "sx10604.png";
};
Bitmap RID_EXTBMP_FILECONTROL
{
File = "sx10605.png";
};
Bitmap RID_EXTBMP_DATEFIELD
{
File = "sx10704.png";
};
Bitmap RID_EXTBMP_TIMEFIELD
{
File = "sx10705.png";
};
Bitmap RID_EXTBMP_NUMERICFIELD
{
File = "sx10706.png";
};
Bitmap RID_EXTBMP_CURRENCYFIELD
{
File = "sx10707.png";
};
Bitmap RID_EXTBMP_PATTERNFIELD
{
File = "sx10708.png";
};
Bitmap RID_EXTBMP_IMAGECONTROL
{
File = "sx10710.png";
};
Bitmap RID_EXTBMP_HIDDEN
{
File = "sx18022.png";
};
Bitmap RID_EXTBMP_FORMATTEDFIELD
{
File = "sx10728.png";
};
Bitmap RID_EXTBMP_FILTER
{
File = "sx10715.png";
};
Bitmap RID_EXTBMP_FORMS
{
File = "sx18013.png";
};
Bitmap RID_EXTBMP_FORM
{
File = "sx10593.png";
};
Bitmap RID_EXTBMP_COLLAPSEDNODE
{
File = "sx18002.png";
};
Bitmap RID_EXTBMP_EXPANDEDNODE
{
File = "sx18003.png";
};
Bitmap RID_EXTBMP_SCROLLBAR
{
File = "sx10768.png";
};
Bitmap RID_EXTBMP_SPINBUTTON
{
File = "sx10769.png";
};
Bitmap RID_EXTBMP_NAVIGATIONBAR
{
File = "sx10607.png";
};
String RID_STR_PROPTITLE_PUSHBUTTON String RID_STR_PROPTITLE_PUSHBUTTON
{ {
Text [ en-US ] = "Button" ; Text [ en-US ] = "Button" ;
......
extensions/source/propctrlr/selectlabeldialog.cxx
Dosyayı görüntüle @ 816190b7
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "selectlabeldialog.hxx" #include "selectlabeldialog.hxx"
#include "formresid.hrc" #include "formresid.hrc"
#include "bitmaps.hlst"
#include "formbrowsertools.hxx" #include "formbrowsertools.hxx"
#include "formstrings.hxx" #include "formstrings.hxx"
#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/FormComponentType.hpp>
...@@ -64,8 +65,8 @@ namespace pcr ...@@ -64,8 +65,8 @@ namespace pcr
m_pControlTree->EnableInplaceEditing( false ); m_pControlTree->EnableInplaceEditing( false );
m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL); m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_EXTBMP_COLLAPSEDNODE))), m_pControlTree->SetNodeBitmaps(Image(BitmapEx(RID_EXTBMP_COLLAPSEDNODE)),
Image(BitmapEx(PcrRes(RID_EXTBMP_EXPANDEDNODE)))); Image(BitmapEx(RID_EXTBMP_EXPANDEDNODE)));
m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
...@@ -99,7 +100,7 @@ namespace pcr ...@@ -99,7 +100,7 @@ namespace pcr
sal_Int16 nClassId = 0; sal_Int16 nClassId = 0;
try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT); m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT);
m_aRequiredControlImage = Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ? RID_EXTBMP_GROUPBOX : RID_EXTBMP_FIXEDTEXT))); m_aRequiredControlImage = Image(BitmapEx(FormComponentType::RADIOBUTTON == nClassId ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT)));
// calc the currently set label control (so InsertEntries can calc m_pInitialSelection) // calc the currently set label control (so InsertEntries can calc m_pInitialSelection)
Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) ); Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
...@@ -110,7 +111,7 @@ namespace pcr ...@@ -110,7 +111,7 @@ namespace pcr
aCurrentLabelControl >>= m_xInitialLabelControl; aCurrentLabelControl >>= m_xInitialLabelControl;
// insert the root // insert the root
Image aRootImage(BitmapEx(PcrRes(RID_EXTBMP_FORMS))); Image aRootImage(BitmapEx(RID_EXTBMP_FORMS));
SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage); SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
// build the tree // build the tree
...@@ -198,7 +199,7 @@ namespace pcr ...@@ -198,7 +199,7 @@ namespace pcr
Reference< XIndexAccess > xCont(xAsSet, UNO_QUERY); Reference< XIndexAccess > xCont(xAsSet, UNO_QUERY);
if (xCont.is() && xCont->getCount()) if (xCont.is() && xCont->getCount())
{ // yes -> step down { // yes -> step down
Image aFormImage(BitmapEx(PcrRes(RID_EXTBMP_FORM))); Image aFormImage(BitmapEx(RID_EXTBMP_FORM));
SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry); SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
sal_Int32 nContChildren = InsertEntries(xCont, pCont); sal_Int32 nContChildren = InsertEntries(xCont, pCont);
if (nContChildren) if (nContChildren)
......
extensions/source/propctrlr/taborder.cxx
Dosyayı görüntüle @ 816190b7
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "modulepcr.hxx" #include "modulepcr.hxx"
#include "formresid.hrc" #include "formresid.hrc"
#include "bitmaps.hlst"
#include "formstrings.hxx" #include "formstrings.hxx"
#include <comphelper/types.hxx> #include <comphelper/types.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
...@@ -44,39 +45,39 @@ namespace pcr ...@@ -44,39 +45,39 @@ namespace pcr
Image GetImage( const Reference< XPropertySet >& _rxSet ) Image GetImage( const Reference< XPropertySet >& _rxSet )
{ {
sal_uInt16 nImageId = RID_EXTBMP_CONTROL; OUString sImageId = RID_EXTBMP_CONTROL;
// TODO: classify controls also in Basic propbrw // TODO: classify controls also in Basic propbrw
if ( _rxSet.is() && ::comphelper::hasProperty( PROPERTY_CLASSID, _rxSet ) ) if ( _rxSet.is() && ::comphelper::hasProperty( PROPERTY_CLASSID, _rxSet ) )
{ {
switch( ::comphelper::getINT16( _rxSet->getPropertyValue( PROPERTY_CLASSID ) ) ) switch( ::comphelper::getINT16( _rxSet->getPropertyValue( PROPERTY_CLASSID ) ) )
{ {
case FormComponentType::COMMANDBUTTON: nImageId = RID_EXTBMP_BUTTON; break; case FormComponentType::COMMANDBUTTON: sImageId = RID_EXTBMP_BUTTON; break;
case FormComponentType::FIXEDTEXT: nImageId = RID_EXTBMP_FIXEDTEXT; break; case FormComponentType::FIXEDTEXT: sImageId = RID_EXTBMP_FIXEDTEXT; break;
case FormComponentType::TEXTFIELD: nImageId = RID_EXTBMP_EDITBOX; break; case FormComponentType::TEXTFIELD: sImageId = RID_EXTBMP_EDITBOX; break;
case FormComponentType::RADIOBUTTON: nImageId = RID_EXTBMP_RADIOBUTTON; break; case FormComponentType::RADIOBUTTON: sImageId = RID_EXTBMP_RADIOBUTTON; break;
case FormComponentType::CHECKBOX: nImageId = RID_EXTBMP_CHECKBOX; break; case FormComponentType::CHECKBOX: sImageId = RID_EXTBMP_CHECKBOX; break;
case FormComponentType::LISTBOX: nImageId = RID_EXTBMP_LISTBOX; break; case FormComponentType::LISTBOX: sImageId = RID_EXTBMP_LISTBOX; break;
case FormComponentType::COMBOBOX: nImageId = RID_EXTBMP_COMBOBOX; break; case FormComponentType::COMBOBOX: sImageId = RID_EXTBMP_COMBOBOX; break;
case FormComponentType::GROUPBOX: nImageId = RID_EXTBMP_GROUPBOX; break; case FormComponentType::GROUPBOX: sImageId = RID_EXTBMP_GROUPBOX; break;
case FormComponentType::IMAGEBUTTON: nImageId = RID_EXTBMP_IMAGEBUTTON; break; case FormComponentType::IMAGEBUTTON: sImageId = RID_EXTBMP_IMAGEBUTTON; break;
case FormComponentType::FILECONTROL: nImageId = RID_EXTBMP_FILECONTROL; break; case FormComponentType::FILECONTROL: sImageId = RID_EXTBMP_FILECONTROL; break;
case FormComponentType::HIDDENCONTROL: nImageId = RID_EXTBMP_HIDDEN; break; case FormComponentType::HIDDENCONTROL: sImageId = RID_EXTBMP_HIDDEN; break;
case FormComponentType::DATEFIELD: nImageId = RID_EXTBMP_DATEFIELD; break; case FormComponentType::DATEFIELD: sImageId = RID_EXTBMP_DATEFIELD; break;
case FormComponentType::TIMEFIELD: nImageId = RID_EXTBMP_TIMEFIELD; break; case FormComponentType::TIMEFIELD: sImageId = RID_EXTBMP_TIMEFIELD; break;
case FormComponentType::NUMERICFIELD: nImageId = RID_EXTBMP_NUMERICFIELD; break; case FormComponentType::NUMERICFIELD: sImageId = RID_EXTBMP_NUMERICFIELD; break;
case FormComponentType::CURRENCYFIELD: nImageId = RID_EXTBMP_CURRENCYFIELD; break; case FormComponentType::CURRENCYFIELD: sImageId = RID_EXTBMP_CURRENCYFIELD; break;
case FormComponentType::PATTERNFIELD: nImageId = RID_EXTBMP_PATTERNFIELD; break; case FormComponentType::PATTERNFIELD: sImageId = RID_EXTBMP_PATTERNFIELD; break;
case FormComponentType::IMAGECONTROL: nImageId = RID_EXTBMP_IMAGECONTROL; break; case FormComponentType::IMAGECONTROL: sImageId = RID_EXTBMP_IMAGECONTROL; break;
case FormComponentType::GRIDCONTROL: nImageId = RID_EXTBMP_GRID; break; case FormComponentType::GRIDCONTROL: sImageId = RID_EXTBMP_GRID; break;
case FormComponentType::SCROLLBAR: nImageId = RID_EXTBMP_SCROLLBAR; break; case FormComponentType::SCROLLBAR: sImageId = RID_EXTBMP_SCROLLBAR; break;
case FormComponentType::SPINBUTTON: nImageId = RID_EXTBMP_SPINBUTTON; break; case FormComponentType::SPINBUTTON: sImageId = RID_EXTBMP_SPINBUTTON; break;
case FormComponentType::NAVIGATIONBAR: nImageId = RID_EXTBMP_NAVIGATIONBAR; break; case FormComponentType::NAVIGATIONBAR: sImageId = RID_EXTBMP_NAVIGATIONBAR; break;
default: default:
OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" ); OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
} }
} }
return Image(BitmapEx(PcrRes(nImageId)));; return Image(BitmapEx(sImageId));;
} }
} }
......
extensions/source/update/ui/updatecheckui.cxx
Dosyayı görüntüle @ 816190b7
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
#include "rtl/ustrbuf.hxx" #include "rtl/ustrbuf.hxx"
#include "updatecheckui.hrc" #include "bitmaps.hlst"
#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7) #define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7)
...@@ -126,7 +126,6 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper ...@@ -126,7 +126,6 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper
VclPtr<BubbleWindow> mpBubbleWin; VclPtr<BubbleWindow> mpBubbleWin;
VclPtr<SystemWindow> mpIconSysWin; VclPtr<SystemWindow> mpIconSysWin;
VclPtr<MenuBar> mpIconMBar; VclPtr<MenuBar> mpIconMBar;
ResMgr* mpUpdResMgr;
ResMgr* mpSfxResMgr; ResMgr* mpSfxResMgr;
Idle maWaitIdle; Idle maWaitIdle;
Timer maTimeoutTimer; Timer maTimeoutTimer;
...@@ -179,7 +178,6 @@ public: ...@@ -179,7 +178,6 @@ public:
const uno::Reference< beans::XVetoableChangeListener > & aListener) override; const uno::Reference< beans::XVetoableChangeListener > & aListener) override;
}; };
UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xContext) : UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xContext) :
m_xContext(xContext) m_xContext(xContext)
, mpIconMBar( nullptr ) , mpIconMBar( nullptr )
...@@ -188,7 +186,6 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont ...@@ -188,7 +186,6 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
, mbBubbleChanged( false ) , mbBubbleChanged( false )
, mnIconID( 0 ) , mnIconID( 0 )
{ {
mpUpdResMgr = ResMgr::CreateResMgr( "updchk" );
mpSfxResMgr = ResMgr::CreateResMgr( "sfx" ); mpSfxResMgr = ResMgr::CreateResMgr( "sfx" );
maBubbleImage = GetBubbleImage( maBubbleImageURL ); maBubbleImage = GetBubbleImage( maBubbleImageURL );
...@@ -207,16 +204,13 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont ...@@ -207,16 +204,13 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
Application::AddEventListener( maApplicationEventHdl ); Application::AddEventListener( maApplicationEventHdl );
} }
UpdateCheckUI::~UpdateCheckUI() UpdateCheckUI::~UpdateCheckUI()
{ {
Application::RemoveEventListener( maApplicationEventHdl ); Application::RemoveEventListener( maApplicationEventHdl );
RemoveBubbleWindow( true ); RemoveBubbleWindow( true );
delete mpUpdResMgr;
delete mpSfxResMgr; delete mpSfxResMgr;
} }
OUString SAL_CALL OUString SAL_CALL
UpdateCheckUI::getImplementationName() UpdateCheckUI::getImplementationName()
{ {
...@@ -237,19 +231,19 @@ UpdateCheckUI::supportsService( OUString const & serviceName ) ...@@ -237,19 +231,19 @@ UpdateCheckUI::supportsService( OUString const & serviceName )
Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
{ {
sal_uInt32 nResID; OUString sResID;
vcl::Window *pMBarWin = pMBar->GetWindow(); vcl::Window *pMBarWin = pMBar->GetWindow();
sal_uInt32 nMBarHeight = 20; sal_uInt32 nMBarHeight = 20;
if ( pMBarWin ) if ( pMBarWin )
nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight(); nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight();
if ( nMBarHeight >= 35 ) if (nMBarHeight >= 35)
nResID = RID_UPDATE_AVAILABLE_26; sResID = RID_UPDATE_AVAILABLE_26;
else else
nResID = RID_UPDATE_AVAILABLE_16; sResID = RID_UPDATE_AVAILABLE_16;
return Image(BitmapEx(ResId(nResID, *mpUpdResMgr))); return Image(BitmapEx(sResID));
} }
Image UpdateCheckUI::GetBubbleImage( OUString &rURL ) Image UpdateCheckUI::GetBubbleImage( OUString &rURL )
......
extensions/source/update/ui/updatecheckui.hrc deleted 100644 → 0
Dosyayı görüntüle @ 7df94869
/* -*- 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 .
*/
#define RID_UPDATECHECKUI_START 1100
#define RID_UPDATE_AVAILABLE_16 RID_UPDATECHECKUI_START + 1
#define RID_UPDATE_AVAILABLE_26 RID_UPDATECHECKUI_START + 2
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
extensions/source/update/ui/updatecheckui.src deleted 100644 → 0
Dosyayı görüntüle @ 7df94869
/* -*- 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 .
*/
#include "updatecheckui.hrc"
Bitmap RID_UPDATE_AVAILABLE_16
{
File = "onlineupdate_16.png";
};
Bitmap RID_UPDATE_AVAILABLE_26
{
File = "onlineupdate_26.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
postprocess/CustomTarget_images.mk
Dosyayı görüntüle @ 816190b7
...@@ -55,6 +55,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \ ...@@ -55,6 +55,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
$(SRCDIR)/chart2/inc/bitmaps.hlst \ $(SRCDIR)/chart2/inc/bitmaps.hlst \
$(SRCDIR)/dbaccess/inc/bitmaps.hlst \ $(SRCDIR)/dbaccess/inc/bitmaps.hlst \
$(SRCDIR)/desktop/inc/bitmaps.hlst \ $(SRCDIR)/desktop/inc/bitmaps.hlst \
$(SRCDIR)/extensions/inc/bitmaps.hlst \
$(SRCDIR)/sfx2/inc/bitmaps.hlst \ $(SRCDIR)/sfx2/inc/bitmaps.hlst \
$(SRCDIR)/vcl/inc/bitmaps.hlst $(SRCDIR)/vcl/inc/bitmaps.hlst
grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@
......
scp2/source/ooo/file_resource_ooo.scp
Dosyayı görüntüle @ 816190b7
...@@ -101,10 +101,6 @@ STD_RES_FILE( gid_File_Res_AVMedia, avmedia ) ...@@ -101,10 +101,6 @@ STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec ) STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
#if defined ENABLE_ONLINE_UPDATE
STD_RES_FILE( gid_File_Res_UpdChk, updchk )
#endif
STD_RES_FILE( gid_File_Res_Upd, upd ) STD_RES_FILE( gid_File_Res_Upd, upd )
STD_RES_FILE( gid_File_Res_T602Filter, t602filter ) STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment