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
fea84e00
Kaydet (Commit)
fea84e00
authored
Eyl 12, 2011
tarafından
Lionel Elie Mamane
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
typo in parameter name
üst
d26b0df3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+15
-15
SelectionBrowseBox.hxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+3
-3
No files found.
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
Dosyayı görüntüle @
fea84e00
...
@@ -1547,11 +1547,11 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
...
@@ -1547,11 +1547,11 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
}
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
void
OSelectionBrowseBox
::
InsertColumn
(
OTableFieldDescRef
pEntry
,
sal_uInt16
&
_nColumnPostion
)
void
OSelectionBrowseBox
::
InsertColumn
(
OTableFieldDescRef
pEntry
,
sal_uInt16
&
_nColumnPos
i
tion
)
{
{
DBG_CHKTHIS
(
OSelectionBrowseBox
,
NULL
);
DBG_CHKTHIS
(
OSelectionBrowseBox
,
NULL
);
// das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
// das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
OSL_ENSURE
(
_nColumnPos
tion
==
BROWSER_INVALIDID
||
(
_nColumnPos
tion
<=
(
long
)
getFields
().
size
()),
"OSelectionBrowseBox::InsertColumn : invalid parameter nColId."
);
OSL_ENSURE
(
_nColumnPos
ition
==
BROWSER_INVALIDID
||
(
_nColumnPosi
tion
<=
(
long
)
getFields
().
size
()),
"OSelectionBrowseBox::InsertColumn : invalid parameter nColId."
);
// -1 heisst ganz hinten, Count heisst ganz hinten, der Rest bezeichnet eine richtige Position
// -1 heisst ganz hinten, Count heisst ganz hinten, der Rest bezeichnet eine richtige Position
sal_uInt16
nCurCol
=
GetCurColumnId
();
sal_uInt16
nCurCol
=
GetCurColumnId
();
...
@@ -1560,21 +1560,21 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
...
@@ -1560,21 +1560,21 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
DeactivateCell
();
DeactivateCell
();
// remember the column id of the current positon
// remember the column id of the current positon
sal_uInt16
nColumnId
=
GetColumnId
(
_nColumnPostion
);
sal_uInt16
nColumnId
=
GetColumnId
(
_nColumnPos
i
tion
);
// Wenn zu klein oder zu gross, auf Ende der Liste setzen
// Wenn zu klein oder zu gross, auf Ende der Liste setzen
if
((
_nColumnPos
tion
==
BROWSER_INVALIDID
)
||
(
_nColumnPos
tion
>=
getFields
().
size
()))
// Anhaengen des Feldes
if
((
_nColumnPos
ition
==
BROWSER_INVALIDID
)
||
(
_nColumnPosi
tion
>=
getFields
().
size
()))
// Anhaengen des Feldes
{
{
if
(
FindFirstFreeCol
(
_nColumnPostion
)
==
NULL
)
// keine freie Column mehr
if
(
FindFirstFreeCol
(
_nColumnPos
i
tion
)
==
NULL
)
// keine freie Column mehr
{
{
AppendNewCol
(
1
);
AppendNewCol
(
1
);
_nColumnPostion
=
sal
::
static_int_cast
<
sal_uInt16
>
(
_nColumnPos
i
tion
=
sal
::
static_int_cast
<
sal_uInt16
>
(
getFields
().
size
());
getFields
().
size
());
}
}
else
else
++
_nColumnPostion
;
// innerhalb der vorgegebenen Liste
++
_nColumnPos
i
tion
;
// innerhalb der vorgegebenen Liste
nColumnId
=
GetColumnId
(
_nColumnPostion
);
nColumnId
=
GetColumnId
(
_nColumnPos
i
tion
);
pEntry
->
SetColumnId
(
nColumnId
);
pEntry
->
SetColumnId
(
nColumnId
);
getFields
()[
_nColumnPostion
-
1
]
=
pEntry
;
getFields
()[
_nColumnPos
i
tion
-
1
]
=
pEntry
;
}
}
// check if the column ids are identical, if not we have to move
// check if the column ids are identical, if not we have to move
...
@@ -1582,7 +1582,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
...
@@ -1582,7 +1582,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
{
{
sal_uInt16
nOldPosition
=
GetColumnPos
(
pEntry
->
GetColumnId
());
sal_uInt16
nOldPosition
=
GetColumnPos
(
pEntry
->
GetColumnId
());
OSL_ENSURE
(
nOldPosition
!=
0
,
"Old position was 0. Not possible!"
);
OSL_ENSURE
(
nOldPosition
!=
0
,
"Old position was 0. Not possible!"
);
SetColumnPos
(
pEntry
->
GetColumnId
(),
_nColumnPostion
);
SetColumnPos
(
pEntry
->
GetColumnId
(),
_nColumnPos
i
tion
);
// we have to delete an empty field for the fields list, because the columns must have equal length
// we have to delete an empty field for the fields list, because the columns must have equal length
if
(
nOldPosition
>
0
&&
nOldPosition
<=
getFields
().
size
()
)
if
(
nOldPosition
>
0
&&
nOldPosition
<=
getFields
().
size
()
)
getFields
()[
nOldPosition
-
1
]
=
pEntry
;
getFields
()[
nOldPosition
-
1
]
=
pEntry
;
...
@@ -1611,7 +1611,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
...
@@ -1611,7 +1611,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
}
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
OTableFieldDescRef
OSelectionBrowseBox
::
InsertField
(
const
OJoinExchangeData
&
jxdSource
,
sal_uInt16
_nColumnPostion
,
sal_Bool
bVis
,
sal_Bool
bActivate
)
OTableFieldDescRef
OSelectionBrowseBox
::
InsertField
(
const
OJoinExchangeData
&
jxdSource
,
sal_uInt16
_nColumnPos
i
tion
,
sal_Bool
bVis
,
sal_Bool
bActivate
)
{
{
DBG_CHKTHIS
(
OSelectionBrowseBox
,
NULL
);
DBG_CHKTHIS
(
OSelectionBrowseBox
,
NULL
);
OQueryTableWindow
*
pSourceWin
=
static_cast
<
OQueryTableWindow
*>
(
jxdSource
.
pListBox
->
GetTabWin
());
OQueryTableWindow
*
pSourceWin
=
static_cast
<
OQueryTableWindow
*>
(
jxdSource
.
pListBox
->
GetTabWin
());
...
@@ -1633,11 +1633,11 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd
...
@@ -1633,11 +1633,11 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd
aInfo
->
SetDataType
(
pInf
->
GetDataType
());
aInfo
->
SetDataType
(
pInf
->
GetDataType
());
aInfo
->
SetVisible
(
bVis
);
aInfo
->
SetVisible
(
bVis
);
return
InsertField
(
aInfo
,
_nColumnPostion
,
bVis
,
bActivate
);
return
InsertField
(
aInfo
,
_nColumnPos
i
tion
,
bVis
,
bActivate
);
}
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
OTableFieldDescRef
OSelectionBrowseBox
::
InsertField
(
const
OTableFieldDescRef
&
_rInfo
,
sal_uInt16
_nColumnPostion
,
sal_Bool
bVis
,
sal_Bool
bActivate
)
OTableFieldDescRef
OSelectionBrowseBox
::
InsertField
(
const
OTableFieldDescRef
&
_rInfo
,
sal_uInt16
_nColumnPos
i
tion
,
sal_Bool
bVis
,
sal_Bool
bActivate
)
{
{
DBG_CHKTHIS
(
OSelectionBrowseBox
,
NULL
);
DBG_CHKTHIS
(
OSelectionBrowseBox
,
NULL
);
...
@@ -1651,14 +1651,14 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _r
...
@@ -1651,14 +1651,14 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _r
pEntry
->
SetVisible
(
bVis
);
pEntry
->
SetVisible
(
bVis
);
// Spalte einfuegen
// Spalte einfuegen
InsertColumn
(
pEntry
,
_nColumnPostion
);
InsertColumn
(
pEntry
,
_nColumnPos
i
tion
);
if
(
!
m_bInUndoMode
)
if
(
!
m_bInUndoMode
)
{
{
// UndoAction erzeugen
// UndoAction erzeugen
OTabFieldCreateUndoAct
*
pUndoAction
=
new
OTabFieldCreateUndoAct
(
this
);
OTabFieldCreateUndoAct
*
pUndoAction
=
new
OTabFieldCreateUndoAct
(
this
);
pUndoAction
->
SetTabFieldDescr
(
pEntry
);
pUndoAction
->
SetTabFieldDescr
(
pEntry
);
pUndoAction
->
SetColumnPosition
(
_nColumnPostion
);
pUndoAction
->
SetColumnPosition
(
_nColumnPos
i
tion
);
getDesignView
()
->
getController
().
addUndoActionAndInvalidate
(
pUndoAction
);
getDesignView
()
->
getController
().
addUndoActionAndInvalidate
(
pUndoAction
);
}
}
...
...
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
Dosyayı görüntüle @
fea84e00
...
@@ -99,9 +99,9 @@ namespace dbaui
...
@@ -99,9 +99,9 @@ namespace dbaui
~
OSelectionBrowseBox
();
~
OSelectionBrowseBox
();
void
initialize
();
void
initialize
();
OTableFieldDescRef
InsertField
(
const
OJoinExchangeData
&
jxdSource
,
sal_uInt16
_nColumnPostion
=
BROWSER_INVALIDID
,
sal_Bool
bVis
=
sal_True
,
sal_Bool
bActivate
=
sal_True
);
OTableFieldDescRef
InsertField
(
const
OJoinExchangeData
&
jxdSource
,
sal_uInt16
_nColumnPos
i
tion
=
BROWSER_INVALIDID
,
sal_Bool
bVis
=
sal_True
,
sal_Bool
bActivate
=
sal_True
);
OTableFieldDescRef
InsertField
(
const
OTableFieldDescRef
&
rInfo
,
sal_uInt16
_nColumnPostion
=
BROWSER_INVALIDID
,
sal_Bool
bVis
=
sal_True
,
sal_Bool
bActivate
=
sal_True
);
OTableFieldDescRef
InsertField
(
const
OTableFieldDescRef
&
rInfo
,
sal_uInt16
_nColumnPos
i
tion
=
BROWSER_INVALIDID
,
sal_Bool
bVis
=
sal_True
,
sal_Bool
bActivate
=
sal_True
);
void
InsertColumn
(
OTableFieldDescRef
pEntry
,
sal_uInt16
&
_nColumnPostion
);
void
InsertColumn
(
OTableFieldDescRef
pEntry
,
sal_uInt16
&
_nColumnPos
i
tion
);
void
RemoveColumn
(
sal_uInt16
_nColumnId
);
void
RemoveColumn
(
sal_uInt16
_nColumnId
);
void
DeleteFields
(
const
String
&
rAliasName
);
void
DeleteFields
(
const
String
&
rAliasName
);
...
...
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