[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4f6514eb0904f79b7c2db0958dc580bcf716911c
Author: Mathias Hasselmann math...@openismus.com
Date: Wed Mar 20 00:33:03 2013 +0100
Don't complain about missing colon in empty DSN
Empty datasource names occur with the datasource wizard's first page
when no datasource type has been selected yet.
Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
Reviewed-on: https://gerrit.libreoffice.org/2885
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 77814e5..0c02d64 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -342,8 +342,12 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const
OUString _rDsn) const
sal_Int32 nSeparator = sDsn.indexOf(static_castsal_Unicode(':'));
if (-1 == nSeparator)
{
-// there should be at least one such separator
-OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the colon
!);
+if (!sDsn.isEmpty())
+{
+// there should be at least one such separator
+OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the
colon !);
+}
+
return DST_UNKNOWN;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/dbwizsetup.cxx | 32
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit eca62e11db6d721dd4518ed66169069b5edf64e0
Author: Mathias Hasselmann math...@openismus.com
Date: Fri Mar 22 00:16:08 2013 +0100
Use initialization list for ODbTypeWizDialogSetup
Some members got initialized by assignment instead of initialization
list without need. A refactoring artifact most likely.
Change-Id: I6b1d4036a24bd26443ce7c6e44e51d08b8b83b20
Reviewed-on: https://gerrit.libreoffice.org/2903
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index cb53dfd..d5f2973 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -133,27 +133,27 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window*
_pParent
, m_bApplied(sal_False)
, m_bUIEnabled( sal_True )
, m_bIsConnectable( sal_False)
-, m_sRM_IntroText(ModuleRes(STR_PAGETITLE_INTROPAGE))
-, m_sRM_dBaseText(ModuleRes(STR_PAGETITLE_DBASE))
-, m_sRM_TextText(ModuleRes(STR_PAGETITLE_TEXT))
-, m_sRM_MSAccessText(ModuleRes(STR_PAGETITLE_MSACCESS))
-, m_sRM_LDAPText(ModuleRes(STR_PAGETITLE_LDAP))
-, m_sRM_ADOText(ModuleRes(STR_PAGETITLE_ADO))
-, m_sRM_JDBCText(ModuleRes(STR_PAGETITLE_JDBC))
-, m_sRM_MySQLNativePageTitle(ModuleRes(STR_PAGETITLE_MYSQL_NATIVE))
+, m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) )
+, m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) )
+, m_sRM_TextText( ModuleRes( STR_PAGETITLE_TEXT ) )
+, m_sRM_MSAccessText( ModuleRes( STR_PAGETITLE_MSACCESS ) )
+, m_sRM_LDAPText( ModuleRes( STR_PAGETITLE_LDAP ) )
+, m_sRM_ADOText( ModuleRes( STR_PAGETITLE_ADO ) )
+, m_sRM_JDBCText( ModuleRes( STR_PAGETITLE_JDBC ) )
+, m_sRM_MySQLNativePageTitle( ModuleRes( STR_PAGETITLE_MYSQL_NATIVE ) )
+, m_sRM_OracleText( ModuleRes( STR_PAGETITLE_ORACLE ) )
+, m_sRM_MySQLText( ModuleRes( STR_PAGETITLE_MYSQL ) )
+, m_sRM_ODBCText( ModuleRes( STR_PAGETITLE_ODBC ) )
+, m_sRM_SpreadSheetText( ModuleRes( STR_PAGETITLE_SPREADSHEET ) )
+, m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) )
+, m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) )
+, m_sWorkPath( SvtPathOptions().GetWorkPath() )
, m_pGeneralPage( NULL )
-, m_pMySQLIntroPage(NULL)
+, m_pMySQLIntroPage( NULL )
, m_pCollection( NULL )
{
DBG_CTOR(ODbTypeWizDialogSetup,NULL);
// no local resources needed anymore
-m_sRM_MySQLText = String(ModuleRes(STR_PAGETITLE_MYSQL));
-m_sRM_OracleText = String(ModuleRes(STR_PAGETITLE_ORACLE));
-m_sRM_ODBCText = String(ModuleRes(STR_PAGETITLE_ODBC));
-m_sRM_SpreadSheetText = String(ModuleRes(STR_PAGETITLE_SPREADSHEET));
-m_sRM_AuthentificationText =
String(ModuleRes(STR_PAGETITLE_AUTHENTIFICATION));
-m_sRM_FinalText = String(ModuleRes(STR_PAGETITLE_FINAL));
-m_sWorkPath = SvtPathOptions().GetWorkPath();
pFinalPage = NULL;
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem,
_pItems-GetItem(DSID_TYPECOLLECTION));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/dbwizsetup.cxx | 20 +---
dbaccess/source/ui/inc/dbwizsetup.hxx |3 +++
2 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit ae88d7ec8ebea00357da345ddb6cd241112d53b8
Author: Mathias Hasselmann math...@openismus.com
Date: Fri Mar 22 00:36:11 2013 +0100
dbwizsetup: Make pFinalPage a class member
It really should not have been a global variable.
Change-Id: I26d4b0d4736a2d026eb61149ede88f6f6ead6dfa
Reviewed-on: https://gerrit.libreoffice.org/2904
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index d5f2973..5b1ba07 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -113,8 +113,6 @@ using namespace ::cppu;
#define START_PAGE 0
#define CONNECTION_PAGE 1
-OFinalDBPageSetup* pFinalPage;
-
DBG_NAME(ODbTypeWizDialogSetup)
//=
//= ODbTypeWizDialogSetup
@@ -150,11 +148,11 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window*
_pParent
, m_sWorkPath( SvtPathOptions().GetWorkPath() )
, m_pGeneralPage( NULL )
, m_pMySQLIntroPage( NULL )
+, m_pFinalPage( NULL )
, m_pCollection( NULL )
{
DBG_CTOR(ODbTypeWizDialogSetup,NULL);
// no local resources needed anymore
-pFinalPage = NULL;
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem,
_pItems-GetItem(DSID_TYPECOLLECTION));
if (pCollectionItem)
@@ -583,7 +581,7 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState
_nState)
case PAGE_DBSETUPWIZARD_FINAL:
pPage =
OFinalDBPageSetup::CreateFinalDBTabPageSetup(this,*m_pOutSet);
-pFinalPage = static_castOFinalDBPageSetup* (pPage);
+m_pFinalPage = static_castOFinalDBPageSetup* (pPage);
break;
}
@@ -674,8 +672,8 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState)
break;
case PAGE_DBSETUPWIZARD_FINAL:
enableButtons( WZB_FINISH, sal_True);
-if ( pFinalPage )
-
pFinalPage-enableTableWizardCheckBox(m_pCollection-supportsTableCreation(m_sURL));
+if ( m_pFinalPage )
+
m_pFinalPage-enableTableWizardCheckBox(m_pCollection-supportsTableCreation(m_sURL));
break;
}
}
@@ -754,7 +752,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
::rtl::OUString sPath = m_pImpl-getDocumentUrl( *m_pOutSet );
xStore-storeAsURL( sPath, aArgs.getPropertyValues() );
-if ( !pFinalPage || pFinalPage-IsDatabaseDocumentToBeRegistered()
)
+if ( !m_pFinalPage ||
m_pFinalPage-IsDatabaseDocumentToBeRegistered() )
RegisterDataSourceByLocation( sPath );
return sal_True;
@@ -788,8 +786,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
if ( m_pGeneralPage-GetDatabaseCreationMode() ==
OGeneralPage::eOpenExisting )
return sal_True;
-if ( pFinalPage != NULL )
-return pFinalPage-IsDatabaseDocumentToBeOpened();
+if ( m_pFinalPage != NULL )
+return m_pFinalPage-IsDatabaseDocumentToBeOpened();
return sal_True;
}
@@ -800,8 +798,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
if ( m_pGeneralPage-GetDatabaseCreationMode() ==
OGeneralPage::eOpenExisting )
return sal_False;
-if ( pFinalPage != NULL )
-return pFinalPage-IsTableWizardToBeStarted();
+if ( m_pFinalPage != NULL )
+return m_pFinalPage-IsTableWizardToBeStarted();
return sal_False;
}
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx
b/dbaccess/source/ui/inc/dbwizsetup.hxx
index d04508a..5d9dd46 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -57,6 +57,7 @@ class ODbDataSourceAdministrationHelper;
/** tab dialog for administrating the office wide registered data sources
*/
class OMySQLIntroPageSetup;
+class OFinalDBPageSetup;
class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public
IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
{
@@ -89,6 +90,8 @@ private:
String m_sWorkPath;
OGeneralPage* m_pGeneralPage;
OMySQLIntroPageSetup* m_pMySQLIntroPage;
+OFinalDBPageSetup* m_pFinalPage;
+
::dbaccess::ODsnTypeCollection*
m_pCollection; /// the DSN type collection
instance
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ffb4e4310ef614d3d9cb26a43461fa3213b52fde
Author: Mathias Hasselmann math...@openismus.com
Date: Fri Mar 22 23:29:20 2013 +0100
Adjust indenting of a few comments
Change-Id: I5c72ea3b8c270c220be388d481569b82b7fa0ff7
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 2d50d1b..b561a3c 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -38,7 +38,7 @@ namespace dbaui
{
//.
-
//
+//
//= OSpreadSheetConnectionPageSetup
//
class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
@@ -259,7 +259,7 @@ namespace dbaui
-
//
+//
//= OAuthentificationPageSetup
//
class OAuthentificationPageSetup : public OGenericAdministrationPage
@@ -286,7 +286,7 @@ namespace dbaui
-
//
+//
//= OFinalDBPageSetup
//
class OFinalDBPageSetup : public OGenericAdministrationPage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d48d67b06f9f0c144bc84155ba0f891041d109f Author: Mathias Hasselmann math...@openismus.com Date: Sat Mar 23 10:19:18 2013 +0100 Use the make binary that configure found in PATH When auto-detecting the GNU make binary from PATH store its absolute path in the GNUMAKE variable to ensure to keep using exactly the same GNU make binary even when the PATH settings change. This is needed because the gbuild system relies on the GNU make features detected and reported by the configure script. Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 Reviewed-on: https://gerrit.libreoffice.org/2924 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/configure.ac b/configure.ac index 7cd27f0..ebb26a8 100644 --- a/configure.ac +++ b/configure.ac @@ -4494,7 +4494,7 @@ for a in $MAKE $GNUMAKE make gmake gnumake; do if test -n $a; then $a --version 2 /dev/null | grep GNU 21 /dev/null if test $? -eq 0; then -GNUMAKE=$a +GNUMAKE=`which $a` break fi fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source extras/source
dbaccess/source/ui/control/opendoccontrols.cxx | 27 +
dbaccess/source/ui/dlg/adminpages.cxx | 13
dbaccess/source/ui/dlg/adminpages.hxx |1
dbaccess/source/ui/inc/opendoccontrols.hxx |2 +
extras/source/glade/libreoffice-catalog.xml.in |8 +++
5 files changed, 51 insertions(+)
New commits:
commit 379988085239fdd93dd87870bcc4966aeaa9b396
Author: Mathias Hasselmann math...@openismus.com
Date: Thu Mar 21 07:58:31 2013 +0100
Add builder support for a few dbaui controls
This adds the needed methods and catalog definitions for
dbaui::OGenericAdministrationPage, dbaui::OpenDocumentButton
and dbaui::OpenDocumentListBox.
Change-Id: I5b883c39f1cb9623c357e5ebec1632816547ff03
Reviewed-on: https://gerrit.libreoffice.org/2886
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 1ae7fe7..907840e 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -38,6 +38,7 @@
#include tools/urlobj.hxx
#include svl/filenotation.hxx
#include osl/diagnose.h
+#include vcl/builder.hxx
//
namespace dbaui
@@ -168,6 +169,19 @@ namespace dbaui
}
//
+OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName )
+:PushButton( _pParent )
+{
+impl_init( _pAsciiModuleName );
+}
+
+//
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton(
Window *pParent, VclBuilder::stringmap )
+{
+return new OpenDocumentButton( pParent,
com.sun.star.sdb.OfficeDatabaseDocument );
+}
+
+//
void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName )
{
OSL_ENSURE( _pAsciiModuleName, OpenDocumentButton::impl_init: invalid
module name! );
@@ -198,6 +212,19 @@ namespace dbaui
}
//
+OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const
sal_Char* _pAsciiModuleName )
+:ListBox( _pParent, WB_BORDER | WB_DROPDOWN )
+{
+impl_init( _pAsciiModuleName );
+}
+
+//
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox(
Window *pParent, VclBuilder::stringmap )
+{
+return new OpenDocumentListBox( pParent,
com.sun.star.sdb.OfficeDatabaseDocument );
+}
+
+//
void OpenDocumentListBox::impl_init( const sal_Char* _pAsciiModuleName )
{
OSL_ENSURE( _pAsciiModuleName, OpenDocumentListBox::impl_init:
invalid module name! );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx
b/dbaccess/source/ui/dlg/adminpages.cxx
index 46840d8..27ce056 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -78,6 +78,19 @@ namespace dbaui
}
//-
+OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent,
const rtl::OString _rId, const rtl::OUString _rUIXMLDescription, const
SfxItemSet _rAttrSet)
+:SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet)
+,m_abEnableRoadmap(sal_False)
+,m_pAdminDialog(NULL)
+,m_pItemSetHelper(NULL)
+,m_pFT_HeaderText(NULL)
+{
+DBG_CTOR(OGenericAdministrationPage,NULL);
+
+SetExchangeSupport(sal_True);
+}
+
+//-
OGenericAdministrationPage::~OGenericAdministrationPage()
{
DELETEZ(m_pFT_HeaderText);
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx
b/dbaccess/source/ui/dlg/adminpages.hxx
index 7e5dcdc..e9e11c8 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -109,6 +109,7 @@ namespace dbaui
m_xORB;
public:
OGenericAdministrationPage(Window* _pParent, const ResId _rId, const
SfxItemSet _rAttrSet);
+OGenericAdministrationPage(Window* _pParent, const rtl::OString _rId,
const rtl::OUString _rUIXMLDescription, const SfxItemSet _rAttrSet);
~OGenericAdministrationPage();
/// set a handler which gets called every time something on the page
has been modified
diff --git a/dbaccess/source/ui/inc
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/control/opendoccontrols.cxx | 12
dbaccess/source/ui/inc/opendoccontrols.hxx |2 --
2 files changed, 14 deletions(-)
New commits:
commit 4fc429bf61b43fb78eb17aa63004d8bce6757fd2
Author: Mathias Hasselmann math...@openismus.com
Date: Thu Mar 21 08:01:34 2013 +0100
Remove ResId support for a few dbaui controls
This removes the ResId constructors of dbaui::OpenDocumentButton
and dbaui::OpenDocumentListBox.
Change-Id: Ib1d80a3ae7757c81ef0ee6f25ee24e91adce532d
Reviewed-on: https://gerrit.libreoffice.org/2888
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 907840e..41a458c 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -161,12 +161,6 @@ namespace dbaui
//
//= OpenButton
//
-//
-OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName, const ResId _rResId )
-:PushButton( _pParent, _rResId )
-{
-impl_init( _pAsciiModuleName );
-}
//
OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName )
@@ -204,12 +198,6 @@ namespace dbaui
//
//= OpenDocumentListBox
//
-//
-OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const
sal_Char* _pAsciiModuleName, const ResId _rResId )
-:ListBox( _pParent, _rResId )
-{
-impl_init( _pAsciiModuleName );
-}
//
OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const
sal_Char* _pAsciiModuleName )
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx
b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 617476d..5e2edda 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -44,7 +44,6 @@ namespace dbaui
::rtl::OUString m_sModule;
public:
-OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName, const ResId _rResId );
OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName );
protected:
@@ -64,7 +63,6 @@ namespace dbaui
MapIndexToStringPairm_aURLs;
public:
-OpenDocumentListBox( Window* _pParent, const sal_Char*
_pAsciiModuleName, const ResId _rResId );
OpenDocumentListBox( Window* _pParent, const sal_Char*
_pAsciiModuleName );
String GetSelectedDocumentURL() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx | 57 +++
connectivity/source/drivers/evoab2/EApi.h|1
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |8 --
connectivity/source/drivers/evoab2/NResultSet.cxx| 21 +
4 files changed, 64 insertions(+), 23 deletions(-)
New commits:
commit b2983b4653339d83d3e98df4d44608f031dabe9f
Author: Mathias Hasselmann math...@openismus.com
Date: Fri Mar 8 11:47:10 2013 +0100
evoab2: Follow API changes in EDS 3.8
EDS 3.8 deprecates e_book_client_new() and replaces it with various
e_book_client_connect() functions. This patch follows the change
and enables direct read access for the addressbook. That means
instead of receiving contacts via the D-Bus session bus, the
connectivity driver now directly accesses the underlaying SQLite
data base (for reading).
This patch also shuffles code in EApiInit() slightly to avoid
excessive if/else nesting.
Change-Id: If41fb92eed2ea26bbf2d3125a9ba2250f142c5a2
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 987510c..8b7b5cd 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -63,7 +63,7 @@ static ApiMap aCommonApiMap[] =
SYM_MAP( e_book_query_field_exists )
};
-// 3-6 api
+// 3.6 api
static ApiMap aOldApiMap[] =
{
SYM_MAP( e_book_get_addressbooks ),
@@ -76,7 +76,7 @@ static ApiMap aOldApiMap[] =
SYM_MAP( e_source_group_peek_sources )
};
-//= 3-6 api
+//= 3.6 api
static ApiMap aNewApiMap[] =
{
SYM_MAP( e_source_registry_list_sources ),
@@ -87,12 +87,24 @@ static ApiMap aNewApiMap[] =
SYM_MAP( e_source_get_display_name ),
SYM_MAP( e_source_get_uid ),
SYM_MAP( e_source_registry_ref_source),
-SYM_MAP( e_book_client_new ),
SYM_MAP( e_client_open_sync ),
SYM_MAP( e_client_get_source ),
SYM_MAP( e_book_client_get_contacts_sync ),
SYM_MAP( e_client_util_free_object_slist )
};
+
+//== indirect read access (3.6 only)
+static ApiMap aClientApiMap36[] =
+{
+SYM_MAP( e_book_client_new )
+};
+
+//= direct read access API (= 3.8)
+static ApiMap aClientApiMap38[] =
+{
+SYM_MAP( e_book_client_connect_direct_sync )
+};
+
#undef SYM_MAP
templatesize_t N static bool
@@ -122,22 +134,33 @@ bool EApiInit()
aModule = osl_loadModule( rtl::OUString::createFromAscii
( eBookLibNames[ j ] ).pData,
SAL_LOADMODULE_DEFAULT );
-if( aModule)
+
+if( aModule == NULL)
+continue;
+
+if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap))
{
-if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap))
+if (eds_check_version( 3, 6, 0 ) != NULL)
+{
+if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap))
+return true;
+}
+else if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap))
{
-if (eds_check_version(3, 6, 0) == NULL)
+if (eds_check_version( 3, 7, 6 ) != NULL)
{
-if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap))
+if (tryLink( aModule, eBookLibNames[ j ], aClientApiMap36))
return true;
}
-else if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap))
+else
{
-return true;
+if (tryLink( aModule, eBookLibNames[ j ], aClientApiMap38))
+return true;
}
}
-osl_unloadModule( aModule );
}
+
+osl_unloadModule( aModule );
}
fprintf( stderr, Can find no compliant libebook client libraries\n );
return false;
diff --git a/connectivity/source/drivers/evoab2/EApi.h
b/connectivity/source/drivers/evoab2/EApi.h
index 8d188a9..59e2c3a 100644
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
@@ -147,6 +147,7 @@ EAPI_EXTERN const gchar* (*eds_check_version) (guint
required_major, guint requi
EAPI_EXTERN const gchar* (*e_source_get_uid) (ESource *source);
EAPI_EXTERN ESource* (*e_source_registry_ref_source) (ESourceRegistry
*registry, const gchar *uid);
EAPI_EXTERN EBookClient* (*e_book_client_new) (ESource *source, GError
**error);
+EAPI_EXTERN EBookClient* (*e_book_client_connect_direct_sync) (ESourceRegistry
*registry, ESource *source, GCancellable *cancellable, GError **error);
EAPI_EXTERN gboolean (*e_client_open_sync) (EClient *client, gboolean
only_if_exists, GCancellable *cancellable, GError **error);
EAPI_EXTERN ESource* (*e_client_get_source) (EClient *client);
EAPI_EXTERN gboolean (*e_book_client_get_contacts_sync) (EBookClient *client,
const gchar *sexp, GSList
[Libreoffice-commits] core.git: extras/CustomTarget_glade.mk extras/Module_extras.mk extras/Package_glade.mk extras/source
extras/CustomTarget_glade.mk | 26 + extras/Module_extras.mk|1 extras/Package_glade.mk|2 extras/source/glade/libreoffice-catalog.xml| 124 - extras/source/glade/libreoffice-catalog.xml.in | 124 + extras/source/glade/makewidgetgroup.xslt | 50 ++ 6 files changed, 202 insertions(+), 125 deletions(-) New commits: commit 0f972e94a2fcbc6b227a2ae7b5d435438f6dbdc1 Author: Mathias Hasselmann math...@openismus.com Date: Thu Mar 14 12:54:17 2013 +0100 Show LibreOffice controls in Glade's tool palette Glade didn't show any LibreOffice controls in its tool palette because the catalog didn't have any glade-widget-group element. This adds a XSLT script to automatically generate such element. A better version of the script would create separate groups for each module/namespace, but currently I have no idea how to do this with libxslt, as it doesn't provide fn::distinct-values(). Change-Id: Iaa3e4b0471b58c48838e000e6d78a73b0c6a4bd3 Reviewed-on: https://gerrit.libreoffice.org/2724 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk new file mode 100644 index 000..89d452e --- /dev/null +++ b/extras/CustomTarget_glade.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,extras/glade)) + +# +# Rules +# + +$(call gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml : \ +$(SRCDIR)/extras/source/glade/libreoffice-catalog.xml.in \ +$(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \ +| $(call gb_ExternalExecutable_get_dependencies,xsltproc) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSLT,4) + $(call gb_Helper_abbreviate_dirs, \ + $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ + -o $@ $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt $ \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 7144265..c3cb14b 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,extras)) $(eval $(call gb_Module_add_targets,extras,\ AllLangZip_autotextshare \ CustomTarget_autocorr \ + CustomTarget_glade \ Package_fonts \ Package_glade \ Package_labels \ diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk index 9621aa9..1ac1f69 100644 --- a/extras/Package_glade.mk +++ b/extras/Package_glade.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,extras_glade,$(SRCDIR)/extras/source/glade)) +$(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade))) $(eval $(call gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml)) diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml deleted file mode 100644 index 435449c..000 --- a/extras/source/glade/libreoffice-catalog.xml +++ /dev/null @@ -1,124 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * --- -!-- - * To get glade to use this, put this .xml into a dir e.g. ~/glade - * and - * export GLADE_CATALOG_SEARCH_PATH=~/glade - * for system-wide installation copy into /usr/share/glade/catalogs/ --- -glade-catalog name=LibreOffice domain=glade-3 depends=gtk+ version=1.0 - glade-widget-classes -glade-widget-class title=Thesaurus View name=cuilo-ThesaurusAlternativesCtrl -generic-name=ThesaurusAlternativesCtrl parent=GtkTextView -icon-name=widget-gtk-textview/ -glade-widget-class title=Thesaurus Edit name=cuilo-ReplaceEdit -generic-name=ReplaceEdit parent=GtkEntry -icon-name=widget-gtk-textentry/ -glade-widget-class title=Thesaurus Lookup name=cuilo-LookUpComboBox -generic-name=LookUpComboBox parent=GtkEntry -icon-name=widget-gtk-comboboxtext/ -glade-widget-class title=Hyphen Edit name=cuilo-HyphenEdit -generic-name=ReplaceEdit parent
License Statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Change I73297209f0410db607c1ae4787ba15c3ac08133f was contributed on private basis, without any affiliation. Future contributions will carry a clear indication ownership, making clear if that work is a personal contribution, or if it results from work for my employer or one of its customers. Please notify me during review already if the commit message is missing such indication. Thank you for this awesome project, Mathias ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/2724/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/2885/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/2724/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/2885/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2904/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2904/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2904/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2904/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/2597/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2886/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2886/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2886/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2903/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2888/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2889/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2903/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2889/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2888/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2889/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2889/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2888/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2903/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2888/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/2889/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/96/2596/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/2924/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/1679/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2888/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/1679/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/98/2598/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/2887/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/2924/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Don't complain about missing colon in empty DSN
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2885
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2885/1
Don't complain about missing colon in empty DSN
Empty datasource names occur with the datasource wizard's first page
when no datasource type has been selected yet.
Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
---
M dbaccess/source/core/misc/dsntypes.cxx
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 77814e5..0c02d64 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -342,8 +342,12 @@
sal_Int32 nSeparator = sDsn.indexOf(static_castsal_Unicode(':'));
if (-1 == nSeparator)
{
-// there should be at least one such separator
-OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the colon
!);
+if (!sDsn.isEmpty())
+{
+// there should be at least one such separator
+OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the
colon !);
+}
+
return DST_UNKNOWN;
}
--
To view, visit https://gerrit.libreoffice.org/2885
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Add builder support for a few dbaui controls
* _pParent, const sal_Char* _pAsciiModuleName ); protected: voidimpl_init( const sal_Char* _pAsciiModuleName ); @@ -64,6 +65,7 @@ public: OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName, const ResId _rResId ); +OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName ); String GetSelectedDocumentURL() const; String GetSelectedDocumentFilter() const; diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index f69393d..70b1a2f 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -150,5 +150,13 @@ generic-name=Reference Edit parent=GtkEntry icon-name=widget-gtk-textentry/ +glade-widget-class title=Open Document ListBox name=dbaui-OpenDocumentListBox +generic-name=Open Document ListBox parent=GtkComboBox +icon-name=widget-gtk-combobox/ + +glade-widget-class title=Open Document Button name=dbaui-OpenDocumentButton +generic-name=Open Document Button parent=GtkButton +icon-name=widget-gtk-button/ + /glade-widget-classes /glade-catalog -- To view, visit https://gerrit.libreoffice.org/2886 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b883c39f1cb9623c357e5ebec1632816547ff03 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove ResId support for a few dbaui controls
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2888
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2888/1
Remove ResId support for a few dbaui controls
This removes the ResId constructors of dbaui::OpenDocumentButton
and dbaui::OpenDocumentListBox.
Change-Id: Ib1d80a3ae7757c81ef0ee6f25ee24e91adce532d
---
M dbaccess/source/ui/control/opendoccontrols.cxx
M dbaccess/source/ui/inc/opendoccontrols.hxx
2 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 907840e..41a458c 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -161,12 +161,6 @@
//
//= OpenButton
//
-//
-OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName, const ResId _rResId )
-:PushButton( _pParent, _rResId )
-{
-impl_init( _pAsciiModuleName );
-}
//
OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName )
@@ -204,12 +198,6 @@
//
//= OpenDocumentListBox
//
-//
-OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const
sal_Char* _pAsciiModuleName, const ResId _rResId )
-:ListBox( _pParent, _rResId )
-{
-impl_init( _pAsciiModuleName );
-}
//
OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const
sal_Char* _pAsciiModuleName )
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx
b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 617476d..5e2edda 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -44,7 +44,6 @@
::rtl::OUString m_sModule;
public:
-OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName, const ResId _rResId );
OpenDocumentButton( Window* _pParent, const sal_Char*
_pAsciiModuleName );
protected:
@@ -64,7 +63,6 @@
MapIndexToStringPairm_aURLs;
public:
-OpenDocumentListBox( Window* _pParent, const sal_Char*
_pAsciiModuleName, const ResId _rResId );
OpenDocumentListBox( Window* _pParent, const sal_Char*
_pAsciiModuleName );
String GetSelectedDocumentURL() const;
--
To view, visit https://gerrit.libreoffice.org/2888
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1d80a3ae7757c81ef0ee6f25ee24e91adce532d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Disable database wizard's next-button if needed
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2889
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/2889/1
Disable database wizard's next-button if needed
This disables the database wizard's next-button if the current page cannot
advance yet. This is needed to prevent the wizard from crashing if next gets
pushed when no datasource type is selected yet.
Note that this patch is far from being complete: I am pretty sure that some
of the other datasource pages also could use a custom canAdvance() method.
I'll look at them when transforming the other pages to the UI builder format.
Change-Id: I7f9fc42e534aebf10f4db62e5ae095d04f9be3c7
---
M dbaccess/source/ui/dlg/dbwizsetup.cxx
M dbaccess/source/ui/dlg/generalpage.cxx
M dbaccess/source/ui/dlg/generalpage.hxx
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5db7e5f..b0fe79d 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -375,7 +375,7 @@
OSL_FAIL( ODbTypeWizDialogSetup::activateDatabasePath: unknown
creation mode! );
}
-enableButtons( WZB_NEXT, m_pGeneralPage-GetDatabaseCreationMode() !=
OGeneralPageWizard::eOpenExisting );
+enableButtons( WZB_NEXT, m_pGeneralPage-canAdvance() );
// TODO: this should go into the base class. Point is, we activate a
path whose *last*
// step is also the current one. The base class should automatically
disable
// the Next button in such a case. However, not for this patch ...
@@ -597,9 +597,11 @@
pPage-SetServiceFactory( m_pImpl-getORB() );
pPage-SetAdminDialog(this, this);
-defaultButton( _nState == PAGE_DBSETUPWIZARD_FINAL ? WZB_FINISH :
WZB_NEXT );
-enableButtons( WZB_FINISH, _nState == PAGE_DBSETUPWIZARD_FINAL );
-enableButtons( WZB_NEXT, _nState == PAGE_DBSETUPWIZARD_FINAL ?
sal_False : sal_True);
+const bool bEnableFinish = _nState == PAGE_DBSETUPWIZARD_FINAL;
+const bool bEnableNext = !bEnableNext pPage-canAdvance();
+defaultButton( bEnableFinish ? WZB_FINISH : WZB_NEXT);
+enableButtons( WZB_FINISH, bEnableFinish );
+enableButtons( WZB_NEXT, bEnableNext );
pPage-Show();
}
return pPage;
@@ -670,6 +672,7 @@
switch(_nState)
{
case PAGE_DBSETUPWIZARD_INTRO:
+enableButtons( WZB_NEXT, m_pGeneralPage-canAdvance() );
m_sOldURL = m_sURL;
break;
case PAGE_DBSETUPWIZARD_FINAL:
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 5117f2e..adca33c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -634,6 +634,22 @@
return 0L;
}
+// ---
+bool OGeneralPageWizard::canAdvance() const
+{
+switch ( GetDatabaseCreationMode() )
+{
+case eConnectExternal:
+return !GetSelectedType().isEmpty();
+case eOpenExisting:
+return false;
+case eCreateNew:
+break;
+}
+
+return true;
+}
+
//.
} // namespace dbaui
//.
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx
b/dbaccess/source/ui/dlg/generalpage.hxx
index a10e5ff..264b9bf 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -172,6 +172,8 @@
voidSetChooseDocumentHandler( const Link
_rHandler) { m_aChooseDocumentHandler = _rHandler; }
DocumentDescriptor GetSelectedDocument() const;
+virtual boolcanAdvance() const;
+
protected:
virtual sal_Bool FillItemSet( SfxItemSet _rCoreAttrs );
--
To view, visit https://gerrit.libreoffice.org/2889
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f9fc42e534aebf10f4db62e5ae095d04f9be3c7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use initialization list for ODbTypeWizDialogSetup
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2903
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/2903/1
Use initialization list for ODbTypeWizDialogSetup
Some members got initialized by assignment instead of initialization
list without need. A refactoring artifact most likely.
Change-Id: I6b1d4036a24bd26443ce7c6e44e51d08b8b83b20
---
M dbaccess/source/ui/dlg/dbwizsetup.cxx
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index cb53dfd..d5f2973 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -133,27 +133,27 @@
, m_bApplied(sal_False)
, m_bUIEnabled( sal_True )
, m_bIsConnectable( sal_False)
-, m_sRM_IntroText(ModuleRes(STR_PAGETITLE_INTROPAGE))
-, m_sRM_dBaseText(ModuleRes(STR_PAGETITLE_DBASE))
-, m_sRM_TextText(ModuleRes(STR_PAGETITLE_TEXT))
-, m_sRM_MSAccessText(ModuleRes(STR_PAGETITLE_MSACCESS))
-, m_sRM_LDAPText(ModuleRes(STR_PAGETITLE_LDAP))
-, m_sRM_ADOText(ModuleRes(STR_PAGETITLE_ADO))
-, m_sRM_JDBCText(ModuleRes(STR_PAGETITLE_JDBC))
-, m_sRM_MySQLNativePageTitle(ModuleRes(STR_PAGETITLE_MYSQL_NATIVE))
+, m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) )
+, m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) )
+, m_sRM_TextText( ModuleRes( STR_PAGETITLE_TEXT ) )
+, m_sRM_MSAccessText( ModuleRes( STR_PAGETITLE_MSACCESS ) )
+, m_sRM_LDAPText( ModuleRes( STR_PAGETITLE_LDAP ) )
+, m_sRM_ADOText( ModuleRes( STR_PAGETITLE_ADO ) )
+, m_sRM_JDBCText( ModuleRes( STR_PAGETITLE_JDBC ) )
+, m_sRM_MySQLNativePageTitle( ModuleRes( STR_PAGETITLE_MYSQL_NATIVE ) )
+, m_sRM_OracleText( ModuleRes( STR_PAGETITLE_ORACLE ) )
+, m_sRM_MySQLText( ModuleRes( STR_PAGETITLE_MYSQL ) )
+, m_sRM_ODBCText( ModuleRes( STR_PAGETITLE_ODBC ) )
+, m_sRM_SpreadSheetText( ModuleRes( STR_PAGETITLE_SPREADSHEET ) )
+, m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) )
+, m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) )
+, m_sWorkPath( SvtPathOptions().GetWorkPath() )
, m_pGeneralPage( NULL )
-, m_pMySQLIntroPage(NULL)
+, m_pMySQLIntroPage( NULL )
, m_pCollection( NULL )
{
DBG_CTOR(ODbTypeWizDialogSetup,NULL);
// no local resources needed anymore
-m_sRM_MySQLText = String(ModuleRes(STR_PAGETITLE_MYSQL));
-m_sRM_OracleText = String(ModuleRes(STR_PAGETITLE_ORACLE));
-m_sRM_ODBCText = String(ModuleRes(STR_PAGETITLE_ODBC));
-m_sRM_SpreadSheetText = String(ModuleRes(STR_PAGETITLE_SPREADSHEET));
-m_sRM_AuthentificationText =
String(ModuleRes(STR_PAGETITLE_AUTHENTIFICATION));
-m_sRM_FinalText = String(ModuleRes(STR_PAGETITLE_FINAL));
-m_sWorkPath = SvtPathOptions().GetWorkPath();
pFinalPage = NULL;
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem,
_pItems-GetItem(DSID_TYPECOLLECTION));
--
To view, visit https://gerrit.libreoffice.org/2903
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b1d4036a24bd26443ce7c6e44e51d08b8b83b20
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] dbwizsetup: Make pFinalPage a class member
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2904
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2904/1
dbwizsetup: Make pFinalPage a class member
It really should not have been a global variable.
Change-Id: I26d4b0d4736a2d026eb61149ede88f6f6ead6dfa
---
M dbaccess/source/ui/dlg/dbwizsetup.cxx
M dbaccess/source/ui/inc/dbwizsetup.hxx
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index d5f2973..5b1ba07 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -113,8 +113,6 @@
#define START_PAGE 0
#define CONNECTION_PAGE 1
-OFinalDBPageSetup* pFinalPage;
-
DBG_NAME(ODbTypeWizDialogSetup)
//=
//= ODbTypeWizDialogSetup
@@ -150,11 +148,11 @@
, m_sWorkPath( SvtPathOptions().GetWorkPath() )
, m_pGeneralPage( NULL )
, m_pMySQLIntroPage( NULL )
+, m_pFinalPage( NULL )
, m_pCollection( NULL )
{
DBG_CTOR(ODbTypeWizDialogSetup,NULL);
// no local resources needed anymore
-pFinalPage = NULL;
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem,
_pItems-GetItem(DSID_TYPECOLLECTION));
if (pCollectionItem)
@@ -583,7 +581,7 @@
case PAGE_DBSETUPWIZARD_FINAL:
pPage =
OFinalDBPageSetup::CreateFinalDBTabPageSetup(this,*m_pOutSet);
-pFinalPage = static_castOFinalDBPageSetup* (pPage);
+m_pFinalPage = static_castOFinalDBPageSetup* (pPage);
break;
}
@@ -674,8 +672,8 @@
break;
case PAGE_DBSETUPWIZARD_FINAL:
enableButtons( WZB_FINISH, sal_True);
-if ( pFinalPage )
-
pFinalPage-enableTableWizardCheckBox(m_pCollection-supportsTableCreation(m_sURL));
+if ( m_pFinalPage )
+
m_pFinalPage-enableTableWizardCheckBox(m_pCollection-supportsTableCreation(m_sURL));
break;
}
}
@@ -754,7 +752,7 @@
::rtl::OUString sPath = m_pImpl-getDocumentUrl( *m_pOutSet );
xStore-storeAsURL( sPath, aArgs.getPropertyValues() );
-if ( !pFinalPage || pFinalPage-IsDatabaseDocumentToBeRegistered()
)
+if ( !m_pFinalPage ||
m_pFinalPage-IsDatabaseDocumentToBeRegistered() )
RegisterDataSourceByLocation( sPath );
return sal_True;
@@ -788,8 +786,8 @@
if ( m_pGeneralPage-GetDatabaseCreationMode() ==
OGeneralPage::eOpenExisting )
return sal_True;
-if ( pFinalPage != NULL )
-return pFinalPage-IsDatabaseDocumentToBeOpened();
+if ( m_pFinalPage != NULL )
+return m_pFinalPage-IsDatabaseDocumentToBeOpened();
return sal_True;
}
@@ -800,8 +798,8 @@
if ( m_pGeneralPage-GetDatabaseCreationMode() ==
OGeneralPage::eOpenExisting )
return sal_False;
-if ( pFinalPage != NULL )
-return pFinalPage-IsTableWizardToBeStarted();
+if ( m_pFinalPage != NULL )
+return m_pFinalPage-IsTableWizardToBeStarted();
return sal_False;
}
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx
b/dbaccess/source/ui/inc/dbwizsetup.hxx
index d04508a..5d9dd46 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -57,6 +57,7 @@
/** tab dialog for administrating the office wide registered data sources
*/
class OMySQLIntroPageSetup;
+class OFinalDBPageSetup;
class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public
IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
{
@@ -89,6 +90,8 @@
String m_sWorkPath;
OGeneralPage* m_pGeneralPage;
OMySQLIntroPageSetup* m_pMySQLIntroPage;
+OFinalDBPageSetup* m_pFinalPage;
+
::dbaccess::ODsnTypeCollection*
m_pCollection; /// the DSN type collection
instance
--
To view, visit https://gerrit.libreoffice.org/2904
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26d4b0d4736a2d026eb61149ede88f6f6ead6dfa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use the make binary that configure found in PATH
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2924 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/2924/1 Use the make binary that configure found in PATH When auto-detecting the GNU make binary from PATH store its absolute path in the GNUMAKE variable to ensure to keep using exactly the same GNU make binary even when the PATH settings change. This is needed because the gbuild system relies on the GNU make features detected and reported by the configure script. Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b9b11f6..665bd2e 100644 --- a/configure.ac +++ b/configure.ac @@ -4483,7 +4483,7 @@ if test -n $a; then $a --version 2 /dev/null | grep GNU 21 /dev/null if test $? -eq 0; then -GNUMAKE=$a +GNUMAKE=`which $a` break fi fi -- To view, visit https://gerrit.libreoffice.org/2924 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] evoab2: Avoid G_N_ELEMENTS when loading symbols
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2596
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/2596/1
evoab2: Avoid G_N_ELEMENTS when loading symbols
With G_N_ELEMENTS() the array name has to be twice, which can cause
hard to spot typos in code derived from copy-and-paste, as we have
here in the module loader. C++ can avoid the duplication by using
the proper templates.
Change-Id: I485e28a92e74b7e24f4a59cced6e5635f3a53a38
---
M connectivity/source/drivers/evoab2/EApi.cxx
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 608b1f9..8e0d0db 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -95,10 +95,10 @@
};
#undef SYM_MAP
-static bool
-tryLink( oslModule aModule, const char *pName, ApiMap *pMap, guint nEntries )
+templatesize_t N static bool
+tryLink( oslModule aModule, const char *pName, const ApiMap (pMap)[N])
{
-for (guint i = 0; i nEntries; ++i)
+for (guint i = 0; i N; ++i)
{
SymbolFunc aMethod = (SymbolFunc)osl_getFunctionSymbol
(aModule, OUString::createFromAscii ( pMap[ i ].sym_name ).pData);
@@ -124,14 +124,14 @@
SAL_LOADMODULE_DEFAULT );
if( aModule)
{
-if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap,
G_N_ELEMENTS(aCommonApiMap)))
+if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap))
{
if (eds_check_version(3, 6, 0) == NULL)
{
-if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap,
G_N_ELEMENTS(aNewApiMap)))
+if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap))
return true;
}
-else if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap,
G_N_ELEMENTS(aOldApiMap)))
+else if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap))
{
return true;
}
--
To view, visit https://gerrit.libreoffice.org/2596
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I485e28a92e74b7e24f4a59cced6e5635f3a53a38
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] evoab2: Move get_e_source_registry() to EApi.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2597
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/2597/1
evoab2: Move get_e_source_registry() to EApi.cxx
get_e_source_registry() was declared in EApi.hxx, but defined in
NDatabaseMetaData.cxx. This doesn't seem right, the header file
and the purpose of the function indicate that it belongs into
EApi.cxx.
Change-Id: Iea3f11a901398aa3f467b96fbe8778c403887bcb
---
M connectivity/source/drivers/evoab2/EApi.cxx
M connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 8e0d0db..987510c 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -143,4 +143,12 @@
return false;
}
+ESourceRegistry *get_e_source_registry()
+{
+static ESourceRegistry *theInstance;
+if (!theInstance)
+theInstance = e_source_registry_new_sync(NULL, NULL);
+return theInstance;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index bfe9f01..a214bd1 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -1086,14 +1086,6 @@
return xResultSet;
}
-ESourceRegistry *get_e_source_registry()
-{
-static ESourceRegistry *theInstance;
-if (!theInstance)
-theInstance = e_source_registry_new_sync(NULL, NULL);
-return theInstance;
-}
-
// -
bool isSourceBackend(ESource *pSource, const char *backendname)
{
--
To view, visit https://gerrit.libreoffice.org/2597
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea3f11a901398aa3f467b96fbe8778c403887bcb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] evoab2: Follow API changes in EDS 3.8
@@
return NULL;
ESource *pSource =
e_source_registry_ref_source(get_e_source_registry(), id);
-EBookClient *pBook = pSource ? e_book_client_new (pSource, NULL) :
NULL;
+EBookClient *pBook = pSource ? createClient (pSource) : NULL;
if (pBook !e_client_open_sync (pBook, TRUE, NULL, NULL))
{
g_object_unref (G_OBJECT (pBook));
@@ -478,6 +478,21 @@
m_pContacts = g_slist_sort_with_data( m_pContacts, CompareContacts,
const_cast gpointer ( static_cast gconstpointer ( _rCompData
) ) );
+}
+
+protected:
+virtual EBookClient * createClient( ESource *pSource )
+{
+return e_book_client_new (pSource, NULL);
+}
+};
+
+class OEvoabVersion38Helper : public OEvoabVersion36Helper
+{
+protected:
+virtual EBookClient * createClient( ESource *pSource )
+{
+return e_book_client_connect_direct_sync (get_e_source_registry (),
pSource, NULL, NULL);
}
};
@@ -614,7 +629,9 @@
,m_nIndex(-1)
,m_nLength(0)
{
-if (eds_check_version(3, 6, 0) == NULL)
+if (eds_check_version( 3, 7, 6 ) == NULL)
+m_pVersionHelper = new OEvoabVersion38Helper;
+else if (eds_check_version( 3, 6, 0 ) == NULL)
m_pVersionHelper = new OEvoabVersion36Helper;
else
m_pVersionHelper = new OEvoabVersion35Helper;
--
To view, visit https://gerrit.libreoffice.org/2598
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If41fb92eed2ea26bbf2d3125a9ba2250f142c5a2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Show LibreOffice controls in Glade's tool palette
;/xsl:text +/xsl:for-each + + xsl:value-of select=$indent/ + /glade-widget-group + xsl:text#10;/xsl:text +/xsl:copy + /xsl:template + + xsl:template match=@*|node() +xsl:copyxsl:apply-templates select=@*|node()//xsl:copy + /xsl:template + +/xsl:stylesheet -- To view, visit https://gerrit.libreoffice.org/2724 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa3e4b0471b58c48838e000e6d78a73b0c6a4bd3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Resolves: fdo#44718 Add Unicode 2034 (Triple Prime) to OpenS...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1679 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1679/1 Resolves: fdo#44718 Add Unicode 2034 (Triple Prime) to OpenSymbol This adds glyphs for prime (U+2032), double prime (U+2033) and triple prime (U+2034). Change-Id: I73297209f0410db607c1ae4787ba15c3ac08133f --- M extras/source/truetype/symbol/OpenSymbol.sfd 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index a2169dc..53a85c0 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -4,7 +4,7 @@ FamilyName: OpenSymbol Weight: Book Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES - DOES NOT SUCCEED (c) 2011 Olivier Hallot -Version: 102.2 +Version: 102.3 ItalicAngle: 0 UnderlinePosition: -143 UnderlineWidth: 20 @@ -19,7 +19,7 @@ OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1144938807 -ModificationTime: 1321359108 +ModificationTime: 1358186116 PfmFamily: 81 TTFWeight: 400 TTFWidth: 5 @@ -773,18 +773,18 @@ 0 0 EndShort -LangName: 1033 Regular OpenSymbol Version 102.2 -GaspTable: 1 65535 2 +LangName: 1033 Regular OpenSymbol Version 102.3 +GaspTable: 1 65535 2 0 Encoding: Custom UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -24 AntiAlias: 1 FitToEm: 1 -WinInfo: 360 45 15 +WinInfo: 0 45 15 BeginPrivate: 0 EndPrivate -BeginChars: 1001 1001 +BeginChars: 8834 1004 StartChar: Alpha Encoding: 909 913 0 @@ -107629,5 +107629,67 @@ 859 592 859 592 795 615 c 1,22,-1 EndSplineSet EndChar + +StartChar: prime +Encoding: 2032 8242 1001 +Width: 681 +Flags: WO +HStem: 1110 346 +VStem: 236 329 +LayerCount: 2 +Fore +SplineSet +565 1456 m 5,0,-1 + 270 1110 l 5,1,-1 + 236 1110 l 5,2,-1 + 342 1456 l 5,3,-1 + 565 1456 l 5,0,-1 +EndSplineSet +EndChar + +StartChar: primedbl +Encoding: 2033 8243 1002 +Width: 957 +Flags: W +LayerCount: 2 +Fore +SplineSet +565 1456 m 1,0,-1 + 270 1110 l 1,1,-1 + 236 1110 l 1,2,-1 + 342 1456 l 1,3,-1 + 565 1456 l 1,0,-1 +841 1456 m 1,4,-1 + 546 1110 l 1,5,-1 + 512 1110 l 1,6,-1 + 618 1456 l 1,7,-1 + 841 1456 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: primetriple +Encoding: 2034 8244 1003 +Width: 1233 +Flags: W +LayerCount: 2 +Fore +SplineSet +565 1456 m 1,0,-1 + 270 1110 l 1,1,-1 + 236 1110 l 1,2,-1 + 342 1456 l 1,3,-1 + 565 1456 l 1,0,-1 +841 1456 m 1,4,-1 + 546 1110 l 1,5,-1 + 512 1110 l 1,6,-1 + 618 1456 l 1,7,-1 + 841 1456 l 1,4,-1 +1117 1456 m 1,8,-1 + 822 1110 l 1,9,-1 + 788 1110 l 1,10,-1 + 894 1456 l 1,11,-1 + 1117 1456 l 1,8,-1 +EndSplineSet +EndChar EndChars EndSplineFont -- To view, visit https://gerrit.libreoffice.org/1679 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73297209f0410db607c1ae4787ba15c3ac08133f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
