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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
41 deletions
+34
-41
tpsort.cxx
sc/source/ui/dbgui/tpsort.cxx
+20
-25
tpsort.hxx
sc/source/ui/inc/tpsort.hxx
+14
-16
No files found.
sc/source/ui/dbgui/tpsort.cxx
Dosyayı görüntüle @
2bb8328d
...
@@ -61,26 +61,26 @@ using namespace com::sun::star;
...
@@ -61,26 +61,26 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
/*
/*
*
Da sich Einstellungen auf der zweiten TabPage (Optionen) auf
*
Since the settings on the second Tab Page (Options) effects
*
die erste TabPage auswirken, muss es die Moeglichkeit geben,
*
the first Tab Page, there must be a way for it to communicate with the
*
dies der jeweils anderen Seite mitzuteilen
.
*
other Page
.
*
*
*
Im Moment wird dieses Problem ueber zwei Datenmember des TabDialoges
*
At the moment this problem is solved through using two data members of the
*
geloest. Wird eine Seite Aktiviert/Deaktiviert, so gleicht sie diese
*
Tab Pages. If a page is enabled / disabled, it compares this data member
*
Datenmember mit dem eigenen Zustand ab (->Activate()/
Deactivate()).
*
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 sal_Bool HasExchangeSupport() const; -> return sal_True;
* virtual void ActivatePage(const SfxItemSet &);
* virtual void ActivatePage(const SfxItemSet &);
* virtual int DeactivatePage(SfxItemSet * = 0);
* 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
,
ScTabPageSortFields
::
ScTabPageSortFields
(
Window
*
pParent
,
const
SfxItemSet
&
rArgSet
)
const
SfxItemSet
&
rArgSet
)
...
@@ -183,7 +183,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
...
@@ -183,7 +183,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
if
(
aLbSort1
.
GetEntryCount
()
==
0
)
if
(
aLbSort1
.
GetEntryCount
()
==
0
)
FillFieldLists
();
FillFieldLists
();
//
Selektieren der ListBoxe
n:
//
ListBox selectio
n:
if
(
rSortData
.
bDoSort
[
0
]
)
if
(
rSortData
.
bDoSort
[
0
]
)
{
{
...
@@ -200,7 +200,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
...
@@ -200,7 +200,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
}
}
else
else
{
{
aSortLbArr
[
i
]
->
SelectEntryPos
(
0
);
//
"keiner" selektieren
aSortLbArr
[
i
]
->
SelectEntryPos
(
0
);
//
Select none
aDirBtnArr
[
i
][
0
]
->
Check
();
// Up
aDirBtnArr
[
i
][
0
]
->
Check
();
// Up
}
}
}
}
...
@@ -261,7 +261,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
...
@@ -261,7 +261,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
OSL_ENSURE
(
(
nSort1Pos
<=
SC_MAXFIELDS
)
OSL_ENSURE
(
(
nSort1Pos
<=
SC_MAXFIELDS
)
&&
(
nSort2Pos
<=
SC_MAXFIELDS
)
&&
(
nSort2Pos
<=
SC_MAXFIELDS
)
&&
(
nSort3Pos
<=
SC_MAXFIELDS
),
&&
(
nSort3Pos
<=
SC_MAXFIELDS
),
"Array
-Range Fehle
r!"
);
"Array
range erro
r!"
);
if
(
nSort1Pos
==
LISTBOX_ENTRY_NOTFOUND
)
nSort1Pos
=
0
;
if
(
nSort1Pos
==
LISTBOX_ENTRY_NOTFOUND
)
nSort1Pos
=
0
;
if
(
nSort2Pos
==
LISTBOX_ENTRY_NOTFOUND
)
nSort2Pos
=
0
;
if
(
nSort2Pos
==
LISTBOX_ENTRY_NOTFOUND
)
nSort2Pos
=
0
;
...
@@ -273,10 +273,9 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
...
@@ -273,10 +273,9 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData
.
bDoSort
[
1
]
=
(
nSort2Pos
>
0
);
theSortData
.
bDoSort
[
1
]
=
(
nSort2Pos
>
0
);
theSortData
.
bDoSort
[
2
]
=
(
nSort3Pos
>
0
);
theSortData
.
bDoSort
[
2
]
=
(
nSort3Pos
>
0
);
// wenn auf Optionen-Seite "OK" gewaehlt wurde und
// If the "OK" was selected on the Options page while the sort
// dabei die Sortierrichtung umgestellt wurde, so
// direction was changed, then the first field (i.e. nFieldArr[0])
// wird das erste Feld der jeweiligen Richtung als
// of the respective direction is chosen as the sorting criterion:
// Sortierkriterium gewaehlt (steht in nFieldArr[0]):
if
(
bSortByRows
!=
pDlg
->
GetByRows
()
)
if
(
bSortByRows
!=
pDlg
->
GetByRows
()
)
{
{
theSortData
.
nField
[
0
]
=
theSortData
.
nField
[
0
]
=
...
@@ -295,7 +294,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
...
@@ -295,7 +294,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData
.
bAscending
[
0
]
=
aBtnUp1
.
IsChecked
();
theSortData
.
bAscending
[
0
]
=
aBtnUp1
.
IsChecked
();
theSortData
.
bAscending
[
1
]
=
aBtnUp2
.
IsChecked
();
theSortData
.
bAscending
[
1
]
=
aBtnUp2
.
IsChecked
();
theSortData
.
bAscending
[
2
]
=
aBtnUp3
.
IsChecked
();
theSortData
.
bAscending
[
2
]
=
aBtnUp3
.
IsChecked
();
//
bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
//
bHasHeader is in ScTabPageSortOptions::FillItemSet, where it belongs
}
}
else
else
{
{
...
@@ -311,8 +310,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
...
@@ -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
()
void
ScTabPageSortFields
::
ActivatePage
()
{
{
if
(
pDlg
)
if
(
pDlg
)
...
@@ -518,7 +516,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
...
@@ -518,7 +516,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
}
}
//========================================================================
//========================================================================
// Sort
ieroptionen-Tabp
age:
// Sort
option Tab P
age:
//========================================================================
//========================================================================
ScTabPageSortOptions
::
ScTabPageSortOptions
(
Window
*
pParent
,
ScTabPageSortOptions
::
ScTabPageSortOptions
(
Window
*
pParent
,
...
@@ -636,10 +634,7 @@ void ScTabPageSortOptions::Init()
...
@@ -636,10 +634,7 @@ void ScTabPageSortOptions::Init()
aLbOutPos
.
SelectEntryPos
(
0
);
aLbOutPos
.
SelectEntryPos
(
0
);
aEdOutPos
.
SetText
(
EMPTY_STRING
);
aEdOutPos
.
SetText
(
EMPTY_STRING
);
/*
// Check whether the field that is passed on is a database field:
* Ueberpruefen, ob es sich bei dem uebergebenen
* Bereich um einen Datenbankbereich handelt:
*/
ScAddress
aScAddress
(
rSortData
.
nCol1
,
rSortData
.
nRow1
,
nCurTab
);
ScAddress
aScAddress
(
rSortData
.
nCol1
,
rSortData
.
nRow1
,
nCurTab
);
ScRange
(
aScAddress
,
ScRange
(
aScAddress
,
...
@@ -803,7 +798,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
...
@@ -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
()
void
ScTabPageSortOptions
::
ActivatePage
()
{
{
if
(
pDlg
)
if
(
pDlg
)
...
...
sc/source/ui/inc/tpsort.hxx
Dosyayı görüntüle @
2bb8328d
...
@@ -51,7 +51,7 @@ class ScSortDlg;
...
@@ -51,7 +51,7 @@ class ScSortDlg;
struct
ScSortParam
;
struct
ScSortParam
;
//========================================================================
//========================================================================
//
Kriterien (Sort Criteria)
//
Sort Criteria
class
ScTabPageSortFields
:
public
SfxTabPage
class
ScTabPageSortFields
:
public
SfxTabPage
{
{
...
@@ -62,11 +62,11 @@ public:
...
@@ -62,11 +62,11 @@ public:
static
SfxTabPage
*
Create
(
Window
*
pParent
,
static
SfxTabPage
*
Create
(
Window
*
pParent
,
const
SfxItemSet
&
rArgSet
);
const
SfxItemSet
&
rArgSet
);
virtual
sal_Bool
FillItemSet
(
SfxItemSet
&
rArgSet
);
virtual
sal_Bool
FillItemSet
(
SfxItemSet
&
rArgSet
);
virtual
void
Reset
(
const
SfxItemSet
&
rArgSet
);
virtual
void
Reset
(
const
SfxItemSet
&
rArgSet
);
protected
:
protected
:
// f
uer Datenaustausch (sollte noch umgestellt werden
!)
// f
or data exchange (TODO: should be changed
!)
// virtual void ActivatePage ( const SfxItemSet& rSet );
// virtual void ActivatePage ( const SfxItemSet& rSet );
using
SfxTabPage
::
ActivatePage
;
using
SfxTabPage
::
ActivatePage
;
using
SfxTabPage
::
DeactivatePage
;
using
SfxTabPage
::
DeactivatePage
;
...
@@ -93,16 +93,16 @@ private:
...
@@ -93,16 +93,16 @@ private:
String
aStrColumn
;
String
aStrColumn
;
String
aStrRow
;
String
aStrRow
;
const
sal_uInt16
nWhichSort
;
const
sal_uInt16
nWhichSort
;
ScSortDlg
*
pDlg
;
ScSortDlg
*
pDlg
;
ScViewData
*
pViewData
;
ScViewData
*
pViewData
;
const
ScSortParam
&
rSortData
;
const
ScSortParam
&
rSortData
;
SCCOLROW
nFieldArr
[
SC_MAXFIELDS
];
SCCOLROW
nFieldArr
[
SC_MAXFIELDS
];
sal_uInt16
nFieldCount
;
sal_uInt16
nFieldCount
;
SCCOL
nFirstCol
;
SCCOL
nFirstCol
;
SCROW
nFirstRow
;
SCROW
nFirstRow
;
sal_Bool
bHasHeader
;
sal_Bool
bHasHeader
;
sal_Bool
bSortByRows
;
sal_Bool
bSortByRows
;
ListBox
*
aSortLbArr
[
3
];
ListBox
*
aSortLbArr
[
3
];
RadioButton
*
aDirBtnArr
[
3
][
2
];
RadioButton
*
aDirBtnArr
[
3
][
2
];
...
@@ -122,7 +122,7 @@ private:
...
@@ -122,7 +122,7 @@ private:
};
};
//========================================================================
//========================================================================
// Sort
ieroptionen (Sort Options)
// Sort
Options
class
ScDocument
;
class
ScDocument
;
class
ScRangeData
;
class
ScRangeData
;
...
@@ -140,11 +140,11 @@ public:
...
@@ -140,11 +140,11 @@ public:
#define SfxTabPage ::SfxTabPage
#define SfxTabPage ::SfxTabPage
static
SfxTabPage
*
Create
(
Window
*
pParent
,
static
SfxTabPage
*
Create
(
Window
*
pParent
,
const
SfxItemSet
&
rArgSet
);
const
SfxItemSet
&
rArgSet
);
virtual
sal_Bool
FillItemSet
(
SfxItemSet
&
rArgSet
);
virtual
sal_Bool
FillItemSet
(
SfxItemSet
&
rArgSet
);
virtual
void
Reset
(
const
SfxItemSet
&
rArgSet
);
virtual
void
Reset
(
const
SfxItemSet
&
rArgSet
);
protected
:
protected
:
// f
uer Datenaustausch (sollte noch umgestellt werden
!)
// f
or data exchange (TODO: should be changed
!)
// virtual void ActivatePage ( const SfxItemSet& rSet );
// virtual void ActivatePage ( const SfxItemSet& rSet );
using
SfxTabPage
::
ActivatePage
;
using
SfxTabPage
::
ActivatePage
;
using
SfxTabPage
::
DeactivatePage
;
using
SfxTabPage
::
DeactivatePage
;
...
@@ -174,14 +174,12 @@ private:
...
@@ -174,14 +174,12 @@ private:
RadioButton
aBtnTopDown
;
RadioButton
aBtnTopDown
;
RadioButton
aBtnLeftRight
;
RadioButton
aBtnLeftRight
;
// FixedText aFtAreaLabel;
String
aStrRowLabel
;
// FixedInfo aFtArea;
String
aStrColLabel
;
String
aStrRowLabel
;
String
aStrUndefined
;
String
aStrColLabel
;
String
aStrUndefined
;
String
aStrAreaLabel
;
String
aStrAreaLabel
;
const
sal_uInt16
nWhichSort
;
const
sal_uInt16
nWhichSort
;
const
ScSortParam
&
rSortData
;
const
ScSortParam
&
rSortData
;
ScViewData
*
pViewData
;
ScViewData
*
pViewData
;
ScDocument
*
pDoc
;
ScDocument
*
pDoc
;
...
...
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