Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
34bdbcec
Kaydet (Commit)
34bdbcec
authored
Nis 27, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
can detangle the sdext graphic resource now
Change-Id: I2992b859bbebfa4bfae3ea5bfe76e8aa62193f69
üst
6fc5a800
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
9 deletions
+25
-9
CustomTarget_images.mk
postprocess/CustomTarget_images.mk
+1
-0
bitmaps.hlst
sd/inc/bitmaps.hlst
+0
-4
Library_PresentationMinimizer.mk
sdext/Library_PresentationMinimizer.mk
+5
-0
bitmaps.hlst
sdext/inc/bitmaps.hlst
+17
-0
optimizerdialog.cxx
sdext/source/minimizer/optimizerdialog.cxx
+2
-5
No files found.
postprocess/CustomTarget_images.mk
Dosyayı görüntüle @
34bdbcec
...
@@ -64,6 +64,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
...
@@ -64,6 +64,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
$(SRCDIR)/reportdesign/inc/bitmaps.hlst \
$(SRCDIR)/reportdesign/inc/bitmaps.hlst \
$(SRCDIR)/sc/inc/bitmaps.hlst \
$(SRCDIR)/sc/inc/bitmaps.hlst \
$(SRCDIR)/sd/inc/bitmaps.hlst \
$(SRCDIR)/sd/inc/bitmaps.hlst \
$(SRCDIR)/sdext/inc/bitmaps.hlst \
$(SRCDIR)/sfx2/inc/bitmaps.hlst \
$(SRCDIR)/sfx2/inc/bitmaps.hlst \
$(SRCDIR)/svtools/inc/bitmaps.hlst \
$(SRCDIR)/svtools/inc/bitmaps.hlst \
$(SRCDIR)/svx/inc/bitmaps.hlst \
$(SRCDIR)/svx/inc/bitmaps.hlst \
...
...
sd/inc/bitmaps.hlst
Dosyayı görüntüle @
34bdbcec
...
@@ -177,10 +177,6 @@
...
@@ -177,10 +177,6 @@
#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL "sd/res/presenterscreen-ScrollbarThumbBottomNormal.png"
#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL "sd/res/presenterscreen-ScrollbarThumbBottomNormal.png"
#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED "sd/res/presenterscreen-ButtonPlusDisabled.png"
#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED "sd/res/presenterscreen-ButtonPlusDisabled.png"
// This definition is not used directly.
// It is only here to be shipped in images.zip.
// The bitmap itself is used from sdext/source/minimizer.
#define BMP_PRESENTATION_MINIMIZER "sd/res/minimize_presi_80.png"
#define BMP_EMBEDDED "sd/res/nv08.png"
#define BMP_EMBEDDED "sd/res/nv08.png"
#define BMP_LINK "sd/res/nv09.png"
#define BMP_LINK "sd/res/nv09.png"
#define BMP_HYPERLINK "sd/res/nv010.png"
#define BMP_HYPERLINK "sd/res/nv010.png"
...
...
sdext/Library_PresentationMinimizer.mk
Dosyayı görüntüle @
34bdbcec
...
@@ -24,6 +24,11 @@ $(eval $(call gb_Library_use_api,PresentationMinimizer,\
...
@@ -24,6 +24,11 @@ $(eval $(call gb_Library_use_api,PresentationMinimizer,\
udkapi \
udkapi \
))
))
$(eval $(call gb_Library_set_include,PresentationMinimizer,\
$$(INCLUDE) \
-I$(SRCDIR)/sdext/inc \
))
$(eval $(call gb_Library_use_libraries,PresentationMinimizer,\
$(eval $(call gb_Library_use_libraries,PresentationMinimizer,\
cppu \
cppu \
cppuhelper \
cppuhelper \
...
...
sdext/inc/bitmaps.hlst
0 → 100644
Dosyayı görüntüle @
34bdbcec
/* -*- 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_SDEXT_INC_BITMAPS_HRC
#define INCLUDED_SDEXT_INC_BITMAPS_HRC
#define BMP_PRESENTATION_MINIMIZER "sd/res/minimize_presi_80.png"
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
sdext/source/minimizer/optimizerdialog.cxx
Dosyayı görüntüle @
34bdbcec
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include <sal/macros.h>
#include <sal/macros.h>
#include <osl/time.h>
#include <osl/time.h>
#include <tools/urlobj.hxx>
#include <tools/urlobj.hxx>
#include "bitmaps.hlst"
using
namespace
::
com
::
sun
::
star
::
io
;
using
namespace
::
com
::
sun
::
star
::
io
;
using
namespace
::
com
::
sun
::
star
::
ui
;
using
namespace
::
com
::
sun
::
star
::
ui
;
...
@@ -112,10 +112,7 @@ void OptimizerDialog::InitRoadmap()
...
@@ -112,10 +112,7 @@ void OptimizerDialog::InitRoadmap()
InsertRoadmapItem
(
3
,
getString
(
STR_OLE_OBJECTS
),
ITEM_ID_OLE_OPTIMIZATION
);
InsertRoadmapItem
(
3
,
getString
(
STR_OLE_OBJECTS
),
ITEM_ID_OLE_OPTIMIZATION
);
InsertRoadmapItem
(
4
,
getString
(
STR_SUMMARY
),
ITEM_ID_SUMMARY
);
InsertRoadmapItem
(
4
,
getString
(
STR_SUMMARY
),
ITEM_ID_SUMMARY
);
// Well, that's messy, but the
OUString
sURL
(
"private:graphicrepository/"
+
OUString
(
BMP_PRESENTATION_MINIMIZER
));
// BMP_PRESENTATION_MINIMIZER from sd module cannot be used here directly
// that UNO wizard dialog should be converted to ui
OUString
sURL
(
"private:graphicrepository/sd/res/minimize_presi_80.png"
);
xPropertySet
->
setPropertyValue
(
"ImageURL"
,
Any
(
sURL
)
);
xPropertySet
->
setPropertyValue
(
"ImageURL"
,
Any
(
sURL
)
);
xPropertySet
->
setPropertyValue
(
"Activated"
,
Any
(
true
)
);
xPropertySet
->
setPropertyValue
(
"Activated"
,
Any
(
true
)
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment