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
2bb8328d
Kaydet (Commit)
2bb8328d
authored
Şub 28, 2012
tarafından
Albert Thuswaldner
Kaydeden (comit)
Muthu Subramanian
Şub 28, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
German Comments translations.
üst
e54773aa
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
31 deletions
+24
-31
tpsort.cxx
sc/source/ui/dbgui/tpsort.cxx
+20
-25
tpsort.hxx
sc/source/ui/inc/tpsort.hxx
+4
-6
No files found.
sc/source/ui/dbgui/tpsort.cxx
Dosyayı görüntüle @
2bb8328d
...
...
@@ -61,26 +61,26 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
/*
*
Da sich Einstellungen auf der zweiten TabPage (Optionen) auf
*
die erste TabPage auswirken, muss es die Moeglichkeit geben,
*
dies der jeweils anderen Seite mitzuteilen
.
*
Since the settings on the second Tab Page (Options) effects
*
the first Tab Page, there must be a way for it to communicate with the
*
other Page
.
*
*
Im Moment wird dieses Problem ueber zwei Datenmember des TabDialoges
*
geloest. Wird eine Seite Aktiviert/Deaktiviert, so gleicht sie diese
*
Datenmember mit dem eigenen Zustand ab (->Activate()/
Deactivate()).
*
At the moment this problem is solved through using two data members of the
*
Tab Pages. If a page is enabled / disabled, it compares this data member
*
with its own state (-> Activate() /
Deactivate()).
*
*
Die Klasse SfxTabPage bietet mittlerweile ein Verfahren an
:
*
In the meantime the class SfxTabPage offers the following method
:
*
* virtual sal_Bool HasExchangeSupport() const; -> return sal_True;
* virtual void ActivatePage(const SfxItemSet &);
* virtual int DeactivatePage(SfxItemSet * = 0);
*
*
muss noch geaendert werden
!
*
This still needs to be changed
!
*/
//========================================================================
//========================================================================
// Sort
ierkriterien-Tabpage:
// Sort
Criteria Tab page
ScTabPageSortFields
::
ScTabPageSortFields
(
Window
*
pParent
,
const
SfxItemSet
&
rArgSet
)
...
...
@@ -183,7 +183,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
if
(
aLbSort1
.
GetEntryCount
()
==
0
)
FillFieldLists
();
//
Selektieren der ListBoxe
n:
//
ListBox selectio
n:
if
(
rSortData
.
bDoSort
[
0
]
)
{
...
...
@@ -200,7 +200,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
}
else
{
aSortLbArr
[
i
]
->
SelectEntryPos
(
0
);
//
"keiner" selektieren
aSortLbArr
[
i
]
->
SelectEntryPos
(
0
);
//
Select none
aDirBtnArr
[
i
][
0
]
->
Check
();
// Up
}
}
...
...
@@ -261,7 +261,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
OSL_ENSURE
(
(
nSort1Pos
<=
SC_MAXFIELDS
)
&&
(
nSort2Pos
<=
SC_MAXFIELDS
)
&&
(
nSort3Pos
<=
SC_MAXFIELDS
),
"Array
-Range Fehle
r!"
);
"Array
range erro
r!"
);
if
(
nSort1Pos
==
LISTBOX_ENTRY_NOTFOUND
)
nSort1Pos
=
0
;
if
(
nSort2Pos
==
LISTBOX_ENTRY_NOTFOUND
)
nSort2Pos
=
0
;
...
...
@@ -273,10 +273,9 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData
.
bDoSort
[
1
]
=
(
nSort2Pos
>
0
);
theSortData
.
bDoSort
[
2
]
=
(
nSort3Pos
>
0
);
// wenn auf Optionen-Seite "OK" gewaehlt wurde und
// dabei die Sortierrichtung umgestellt wurde, so
// wird das erste Feld der jeweiligen Richtung als
// Sortierkriterium gewaehlt (steht in nFieldArr[0]):
// If the "OK" was selected on the Options page while the sort
// direction was changed, then the first field (i.e. nFieldArr[0])
// of the respective direction is chosen as the sorting criterion:
if
(
bSortByRows
!=
pDlg
->
GetByRows
()
)
{
theSortData
.
nField
[
0
]
=
...
...
@@ -295,7 +294,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData
.
bAscending
[
0
]
=
aBtnUp1
.
IsChecked
();
theSortData
.
bAscending
[
1
]
=
aBtnUp2
.
IsChecked
();
theSortData
.
bAscending
[
2
]
=
aBtnUp3
.
IsChecked
();
//
bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
//
bHasHeader is in ScTabPageSortOptions::FillItemSet, where it belongs
}
else
{
...
...
@@ -311,8 +310,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
// for data exchange without dialogue detour: (still TODO!)
void
ScTabPageSortFields
::
ActivatePage
()
{
if
(
pDlg
)
...
...
@@ -518,7 +516,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
}
//========================================================================
// Sort
ieroptionen-Tabp
age:
// Sort
option Tab P
age:
//========================================================================
ScTabPageSortOptions
::
ScTabPageSortOptions
(
Window
*
pParent
,
...
...
@@ -636,10 +634,7 @@ void ScTabPageSortOptions::Init()
aLbOutPos
.
SelectEntryPos
(
0
);
aEdOutPos
.
SetText
(
EMPTY_STRING
);
/*
* Ueberpruefen, ob es sich bei dem uebergebenen
* Bereich um einen Datenbankbereich handelt:
*/
// Check whether the field that is passed on is a database field:
ScAddress
aScAddress
(
rSortData
.
nCol1
,
rSortData
.
nRow1
,
nCurTab
);
ScRange
(
aScAddress
,
...
...
@@ -803,7 +798,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
// f
uer Datenaustausch ohne Dialog-Umweg: (! noch zu tun
!)
// f
or data exchange without dialogue detour: (still TODO
!)
void
ScTabPageSortOptions
::
ActivatePage
()
{
if
(
pDlg
)
...
...
sc/source/ui/inc/tpsort.hxx
Dosyayı görüntüle @
2bb8328d
...
...
@@ -51,7 +51,7 @@ class ScSortDlg;
struct
ScSortParam
;
//========================================================================
//
Kriterien (Sort Criteria)
//
Sort Criteria
class
ScTabPageSortFields
:
public
SfxTabPage
{
...
...
@@ -66,7 +66,7 @@ public:
virtual
void
Reset
(
const
SfxItemSet
&
rArgSet
);
protected
:
// f
uer Datenaustausch (sollte noch umgestellt werden
!)
// f
or data exchange (TODO: should be changed
!)
// virtual void ActivatePage ( const SfxItemSet& rSet );
using
SfxTabPage
::
ActivatePage
;
using
SfxTabPage
::
DeactivatePage
;
...
...
@@ -122,7 +122,7 @@ private:
};
//========================================================================
// Sort
ieroptionen (Sort Options)
// Sort
Options
class
ScDocument
;
class
ScRangeData
;
...
...
@@ -144,7 +144,7 @@ public:
virtual
void
Reset
(
const
SfxItemSet
&
rArgSet
);
protected
:
// f
uer Datenaustausch (sollte noch umgestellt werden
!)
// f
or data exchange (TODO: should be changed
!)
// virtual void ActivatePage ( const SfxItemSet& rSet );
using
SfxTabPage
::
ActivatePage
;
using
SfxTabPage
::
DeactivatePage
;
...
...
@@ -174,8 +174,6 @@ private:
RadioButton
aBtnTopDown
;
RadioButton
aBtnLeftRight
;
// FixedText aFtAreaLabel;
// FixedInfo aFtArea;
String
aStrRowLabel
;
String
aStrColLabel
;
String
aStrUndefined
;
...
...
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