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
a2dbaac6
Kaydet (Commit)
a2dbaac6
authored
Agu 30, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
default assignment and ctor are fine here
Change-Id: I50edc71ee8bb4398764f2e15180a0269aac233ce
üst
04311182
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
77 deletions
+1
-77
toolbox.h
vcl/inc/toolbox.h
+1
-5
toolbox2.cxx
vcl/source/window/toolbox2.cxx
+0
-72
No files found.
vcl/inc/toolbox.h
Dosyayı görüntüle @
a2dbaac6
...
...
@@ -34,7 +34,7 @@ namespace vcl { class Window; }
struct
ImplToolItem
{
VclPtr
<
vcl
::
Window
>
mpWindow
;
VclPtr
<
vcl
::
Window
>
mpWindow
;
//don't dispose mpWindow - we get copied around
void
*
mpUserData
;
Image
maImage
;
Image
maImageOriginal
;
...
...
@@ -75,10 +75,6 @@ struct ImplToolItem
ImplToolItem
(
sal_uInt16
nItemId
,
const
Image
&
rImage
,
const
OUString
&
rTxt
,
ToolBoxItemBits
nItemBits
);
~
ImplToolItem
();
ImplToolItem
(
const
ImplToolItem
&
);
ImplToolItem
&
operator
=
(
const
ImplToolItem
&
);
// returns the size of a item, taking toolbox orientation into account
// the default size is the precomputed size for standard items
...
...
vcl/source/window/toolbox2.cxx
Dosyayı görüntüle @
a2dbaac6
...
...
@@ -127,78 +127,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
init
(
nItemId
,
nItemBits
,
false
);
}
ImplToolItem
::
ImplToolItem
(
const
ImplToolItem
&
rItem
)
:
mpWindow
(
rItem
.
mpWindow
),
mpUserData
(
rItem
.
mpUserData
),
maImage
(
rItem
.
maImage
),
maImageOriginal
(
rItem
.
maImageOriginal
),
mnImageAngle
(
rItem
.
mnImageAngle
),
mbMirrorMode
(
rItem
.
mbMirrorMode
),
maText
(
rItem
.
maText
),
maQuickHelpText
(
rItem
.
maQuickHelpText
),
maHelpText
(
rItem
.
maHelpText
),
maCommandStr
(
rItem
.
maCommandStr
),
maHelpId
(
rItem
.
maHelpId
),
maRect
(
rItem
.
maRect
),
maCalcRect
(
rItem
.
maCalcRect
),
maMinimalItemSize
(
rItem
.
maMinimalItemSize
),
maItemSize
(
rItem
.
maItemSize
),
mnSepSize
(
rItem
.
mnSepSize
),
mnDropDownArrowWidth
(
rItem
.
mnDropDownArrowWidth
),
maContentSize
(
rItem
.
maContentSize
),
meType
(
rItem
.
meType
),
mnBits
(
rItem
.
mnBits
),
meState
(
rItem
.
meState
),
mnId
(
rItem
.
mnId
),
mbEnabled
(
rItem
.
mbEnabled
),
mbVisible
(
rItem
.
mbVisible
),
mbEmptyBtn
(
rItem
.
mbEmptyBtn
),
mbShowWindow
(
rItem
.
mbShowWindow
),
mbBreak
(
rItem
.
mbBreak
),
mbVisibleText
(
rItem
.
mbVisibleText
),
mbExpand
(
rItem
.
mbExpand
)
{
}
ImplToolItem
::~
ImplToolItem
()
{
// don't dispose mpWindow - we get copied around.
}
ImplToolItem
&
ImplToolItem
::
operator
=
(
const
ImplToolItem
&
rItem
)
{
mpWindow
=
rItem
.
mpWindow
;
mpUserData
=
rItem
.
mpUserData
;
maImage
=
rItem
.
maImage
;
maImageOriginal
=
rItem
.
maImageOriginal
;
mnImageAngle
=
rItem
.
mnImageAngle
;
mbMirrorMode
=
rItem
.
mbMirrorMode
;
maText
=
rItem
.
maText
;
maQuickHelpText
=
rItem
.
maQuickHelpText
;
maHelpText
=
rItem
.
maHelpText
;
maCommandStr
=
rItem
.
maCommandStr
;
maHelpId
=
rItem
.
maHelpId
;
maRect
=
rItem
.
maRect
;
maCalcRect
=
rItem
.
maCalcRect
;
mnSepSize
=
rItem
.
mnSepSize
;
mnDropDownArrowWidth
=
rItem
.
mnDropDownArrowWidth
;
maContentSize
=
rItem
.
maContentSize
;
maMinimalItemSize
=
rItem
.
maMinimalItemSize
;
maItemSize
=
rItem
.
maItemSize
;
mbVisibleText
=
rItem
.
mbVisibleText
;
mbExpand
=
rItem
.
mbExpand
;
meType
=
rItem
.
meType
;
mnBits
=
rItem
.
mnBits
;
meState
=
rItem
.
meState
;
mnId
=
rItem
.
mnId
;
mbEnabled
=
rItem
.
mbEnabled
;
mbVisible
=
rItem
.
mbVisible
;
mbEmptyBtn
=
rItem
.
mbEmptyBtn
;
mbShowWindow
=
rItem
.
mbShowWindow
;
mbBreak
=
rItem
.
mbBreak
;
return
*
this
;
}
Size
ImplToolItem
::
GetSize
(
bool
bHorz
,
bool
bCheckMaxWidth
,
long
maxWidth
,
const
Size
&
rDefaultSize
)
{
Size
aSize
(
rDefaultSize
);
// the size of 'standard' toolbox items
...
...
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