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
4ec87ca7
Kaydet (Commit)
4ec87ca7
authored
Ara 17, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
add dbtools for !HAVE_FEATURE_DBCONNECTIVITY anyway
Change-Id: I7a769ab3c7881eae80849efc5e75eca5846d254f
üst
818d93f1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
15 deletions
+6
-15
Repository.mk
Repository.mk
+1
-1
Library_frm.mk
forms/Library_frm.mk
+3
-8
Grid.cxx
forms/source/component/Grid.cxx
+0
-3
errorbroadcaster.cxx
forms/source/component/errorbroadcaster.cxx
+2
-3
No files found.
Repository.mk
Dosyayı görüntüle @
4ec87ca7
...
...
@@ -310,8 +310,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
dba \
dbase \
dbmm \
dbtools \
dbaxml) \
dbtools \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(USING_X11),desktop_detector) \
...
...
forms/Library_frm.mk
Dosyayı görüntüle @
4ec87ca7
...
...
@@ -61,10 +61,12 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/component/CheckBox \
forms/source/component/clickableimage \
forms/source/component/cloneable \
forms/source/component/errorbroadcaster \
forms/source/component/Columns \
forms/source/component/ComboBox \
forms/source/component/Currency \
forms/source/component/Date \
forms/source/component/DatabaseForm \
forms/source/component/EditBase \
forms/source/component/Edit \
forms/source/component/entrylisthelper \
...
...
@@ -120,6 +122,7 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/richtext/richtextviewport \
forms/source/richtext/rtattributehandler \
forms/source/richtext/specialdispatchers \
forms/source/runtime/formoperations \
forms/source/solar/component/navbarcontrol \
forms/source/solar/control/navtoolbar \
forms/source/xforms/binding \
...
...
@@ -150,12 +153,4 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/xforms/xpathlib/xpathlib \
))
$(eval $(call gb_Library_add_exception_objects,frm,\
$(call gb_Helper_optional,DBCONNECTIVITY, \
forms/source/component/DatabaseForm \
forms/source/component/errorbroadcaster \
forms/source/runtime/formoperations \
) \
))
# vim: set noet sw=4 ts=4:
forms/source/component/Grid.cxx
Dosyayı görüntüle @
4ec87ca7
...
...
@@ -192,15 +192,12 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru
return
aReturn
;
}
#if HAVE_FEATURE_DBCONNECTIVITY
// XSQLErrorListener
void
SAL_CALL
OGridControlModel
::
errorOccured
(
const
SQLErrorEvent
&
_rEvent
)
throw
(
RuntimeException
,
std
::
exception
)
{
// forward the errors which happened to my columns to my own listeners
onError
(
_rEvent
);
}
#endif
// XRowSetSupplier
Reference
<
XRowSet
>
SAL_CALL
OGridControlModel
::
getRowSet
(
)
throw
(
RuntimeException
,
std
::
exception
)
...
...
forms/source/component/errorbroadcaster.cxx
Dosyayı görüntüle @
4ec87ca7
...
...
@@ -20,7 +20,7 @@
#include "errorbroadcaster.hxx"
#include <connectivity/dbtools.hxx>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <config_features.h>
namespace
frm
{
...
...
@@ -61,11 +61,9 @@ namespace frm
void
SAL_CALL
OErrorBroadcaster
::
onError
(
const
SQLException
&
_rException
,
const
OUString
&
_rContextDescription
)
{
Any
aError
;
#if HAVE_FEATURE_DBCONNECTIVITY
if
(
!
_rContextDescription
.
isEmpty
()
)
aError
=
makeAny
(
prependErrorInfo
(
_rException
,
static_cast
<
XSQLErrorBroadcaster
*
>
(
this
),
_rContextDescription
)
);
else
#endif
aError
=
makeAny
(
_rException
);
onError
(
SQLErrorEvent
(
static_cast
<
XSQLErrorBroadcaster
*
>
(
this
),
aError
)
);
...
...
@@ -76,6 +74,7 @@ namespace frm
{
if
(
m_aErrorListeners
.
getLength
()
)
{
::
comphelper
::
OInterfaceIteratorHelper2
aIter
(
m_aErrorListeners
);
while
(
aIter
.
hasMoreElements
()
)
static_cast
<
XSQLErrorListener
*
>
(
aIter
.
next
()
)
->
errorOccured
(
_rError
);
...
...
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