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
08d6cd78
Kaydet (Commit)
08d6cd78
authored
Kas 04, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
strip down to the used pieces
Change-Id: I1d9eed2345f3d8a78f467d0fb5f7b7cd0211a160
üst
a19b18ad
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
118 deletions
+2
-118
optchart.cxx
cui/source/options/optchart.cxx
+2
-118
No files found.
cui/source/options/optchart.cxx
Dosyayı görüntüle @
08d6cd78
...
...
@@ -26,7 +26,7 @@
#include <vcl/svapp.hxx>
#include <svx/svxids.hrc>
class
SAL_WARN_UNUSED
SVX_DLLPUBLIC
ColorLB
:
public
ListBox
class
ColorLB
:
public
ListBox
{
ImpColorList
*
pColorList
;
// separate liste, in case of user data are required from outside
Size
aImageSize
;
...
...
@@ -36,38 +36,21 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC ColorLB : public ListBox
SVT_DLLPRIVATE
void
ImplDestroyColorEntries
();
public
:
ColorLB
(
vcl
::
Window
*
pParent
,
WinBits
nWinStyle
=
WB_BORDER
);
ColorLB
(
vcl
::
Window
*
pParent
,
WinBits
nWinStyle
=
WB_BORDER
);
virtual
~
ColorLB
()
override
;
virtual
void
dispose
()
override
;
virtual
void
UserDraw
(
const
UserDrawEvent
&
rUDEvt
)
override
;
using
ListBox
::
InsertEntry
;
sal_Int32
InsertEntry
(
const
OUString
&
rStr
,
sal_Int32
nPos
=
LISTBOX_APPEND
);
sal_Int32
InsertEntry
(
const
Color
&
rColor
,
const
OUString
&
rStr
,
sal_Int32
nPos
=
LISTBOX_APPEND
);
bool
IsAutomaticSelected
()
{
return
!
GetSelectEntryPos
();
}
using
ListBox
::
RemoveEntry
;
void
RemoveEntry
(
sal_Int32
nPos
);
void
Clear
();
void
CopyEntries
(
const
ColorLB
&
rBox
);
using
ListBox
::
GetEntryPos
;
sal_Int32
GetEntryPos
(
const
Color
&
rColor
)
const
;
Color
GetEntryColor
(
sal_Int32
nPos
)
const
;
void
SelectEntry
(
const
OUString
&
rStr
)
{
ListBox
::
SelectEntry
(
rStr
);
}
void
SelectEntry
(
const
Color
&
rColor
)
{
sal_Int32
nPos
=
GetEntryPos
(
rColor
);
if
(
nPos
!=
LISTBOX_ENTRY_NOTFOUND
)
ListBox
::
SelectEntryPos
(
nPos
);
}
Color
GetSelectEntryColor
()
const
{
sal_Int32
nPos
=
GetSelectEntryPos
();
...
...
@@ -77,25 +60,8 @@ public:
return
aColor
;
}
using
ListBox
::
IsEntrySelected
;
bool
IsEntrySelected
(
const
Color
&
rColor
)
const
{
sal_Int32
nPos
=
GetEntryPos
(
rColor
);
if
(
nPos
!=
LISTBOX_ENTRY_NOTFOUND
)
return
IsEntryPosSelected
(
nPos
);
else
return
false
;
}
void
Fill
(
const
XColorListRef
&
pTab
);
void
Append
(
const
XColorEntry
&
rEntry
);
void
Modify
(
const
XColorEntry
&
rEntry
,
sal_Int32
nPos
);
private
:
ColorLB
(
const
ColorLB
&
)
=
delete
;
ColorLB
&
operator
=
(
const
ColorLB
&
)
=
delete
;
};
VCL_BUILDER_DECL_FACTORY
(
ColorLB
)
...
...
@@ -162,27 +128,6 @@ void ColorLB::dispose()
ListBox
::
dispose
();
}
sal_Int32
ColorLB
::
InsertEntry
(
const
OUString
&
rStr
,
sal_Int32
nPos
)
{
nPos
=
ListBox
::
InsertEntry
(
rStr
,
nPos
);
if
(
nPos
!=
LISTBOX_ERROR
)
{
ImplColorListData
*
pData
=
new
ImplColorListData
;
if
(
static_cast
<
size_t
>
(
nPos
)
<
pColorList
->
size
()
)
{
ImpColorList
::
iterator
it
=
pColorList
->
begin
();
::
std
::
advance
(
it
,
nPos
);
pColorList
->
insert
(
it
,
pData
);
}
else
{
pColorList
->
push_back
(
pData
);
nPos
=
pColorList
->
size
()
-
1
;
}
}
return
nPos
;
}
sal_Int32
ColorLB
::
InsertEntry
(
const
Color
&
rColor
,
const
OUString
&
rStr
,
sal_Int32
nPos
)
{
...
...
@@ -223,44 +168,6 @@ void ColorLB::Clear()
ListBox
::
Clear
();
}
void
ColorLB
::
CopyEntries
(
const
ColorLB
&
rBox
)
{
// Liste leeren
ImplDestroyColorEntries
();
// Daten kopieren
size_t
nCount
=
rBox
.
pColorList
->
size
();
for
(
size_t
n
=
0
;
n
<
nCount
;
n
++
)
{
ImplColorListData
*
pData
=
(
*
rBox
.
pColorList
)[
n
];
sal_Int32
nPos
=
InsertEntry
(
rBox
.
GetEntry
(
n
)
);
if
(
nPos
!=
LISTBOX_ERROR
)
{
if
(
static_cast
<
size_t
>
(
nPos
)
<
pColorList
->
size
()
)
{
ImpColorList
::
iterator
it
=
pColorList
->
begin
();
::
std
::
advance
(
it
,
nPos
);
pColorList
->
insert
(
it
,
new
ImplColorListData
(
*
pData
)
);
}
else
{
pColorList
->
push_back
(
new
ImplColorListData
(
*
pData
)
);
}
}
}
}
sal_Int32
ColorLB
::
GetEntryPos
(
const
Color
&
rColor
)
const
{
for
(
sal_Int32
n
=
(
sal_Int32
)
pColorList
->
size
();
n
;
)
{
ImplColorListData
*
pData
=
(
*
pColorList
)[
--
n
];
if
(
pData
->
bColor
&&
(
pData
->
aColor
==
rColor
)
)
return
n
;
}
return
LISTBOX_ENTRY_NOTFOUND
;
}
Color
ColorLB
::
GetEntryColor
(
sal_Int32
nPos
)
const
{
Color
aColor
;
...
...
@@ -318,31 +225,9 @@ void ColorLB::UserDraw( const UserDrawEvent& rUDEvt )
ListBox
::
DrawEntry
(
rUDEvt
,
true
,
false
);
}
// Fills the Listbox with color and strings
void
ColorLB
::
Fill
(
const
XColorListRef
&
pColorTab
)
{
if
(
!
pColorTab
.
is
()
)
return
;
long
nCount
=
pColorTab
->
Count
();
SetUpdateMode
(
false
);
for
(
long
i
=
0
;
i
<
nCount
;
i
++
)
{
const
XColorEntry
*
pEntry
=
pColorTab
->
GetColor
(
i
);
InsertEntry
(
pEntry
->
GetColor
(),
pEntry
->
GetName
()
);
}
AdaptDropDownLineCountToMaximum
();
SetUpdateMode
(
true
);
}
void
ColorLB
::
Append
(
const
XColorEntry
&
rEntry
)
{
InsertEntry
(
rEntry
.
GetColor
(),
rEntry
.
GetName
()
);
AdaptDropDownLineCountToMaximum
();
}
void
ColorLB
::
Modify
(
const
XColorEntry
&
rEntry
,
sal_Int32
nPos
)
...
...
@@ -351,7 +236,6 @@ void ColorLB::Modify( const XColorEntry& rEntry, sal_Int32 nPos )
InsertEntry
(
rEntry
.
GetColor
(),
rEntry
.
GetName
(),
nPos
);
}
namespace
{
void
FillBoxChartColorLB
(
ColorLB
*
pLB
,
const
SvxChartColorTable
&
rTab
)
...
...
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