-- cgit v1.2.3 From 59a2878cecfb7da16927fcfd15b5d92df39b51ad Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 30 May 2011 18:47:50 +0200 Subject: remove all traces of offuh from makefiles --- dbaccess/Executable_odbcconfig.mk | 6 +++++- dbaccess/Library_adabasui.mk | 6 +++++- dbaccess/Library_dba.mk | 6 +++++- dbaccess/Library_dbaxml.mk | 6 +++++- dbaccess/Library_dbmm.mk | 6 +++++- dbaccess/Library_dbu.mk | 6 +++++- dbaccess/Library_sdbt.mk | 6 +++++- reportdesign/Library_rpt.mk | 6 +++++- reportdesign/Library_rptui.mk | 6 +++++- reportdesign/Library_rptxml.mk | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 9afc9ac40..bb2febd1e 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -34,7 +34,11 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\ -I$(realpath $(SRCDIR)/dbaccess/inc) \ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,odbcconfig,\ + offapi \ + udkapi \ )) $(eval $(call gb_Executable_add_linked_libs,odbcconfig,\ diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk index ee5ae6a71..0e5b7bbe1 100644 --- a/dbaccess/Library_adabasui.mk +++ b/dbaccess/Library_adabasui.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,adabasui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,adabasui,\ @@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,adabasui,\ -DCOMPMOD_NAMESPACE=adabasui \ )) +$(eval $(call gb_Library_add_api,adabasui,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,adabasui,\ comphelper \ cppu \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index fdd57547a..748c209ba 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,dba,\ -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ -I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,dba,\ @@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ )) +$(eval $(call gb_Library_add_api,dba,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,dba,\ comphelper \ cppu \ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index e0a190898..477f86b53 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,dbaxml,\ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,dbaxml,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_linked_libs,dbaxml,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index db6b152b2..023157dda 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -38,7 +38,11 @@ $(eval $(call gb_Library_set_include,dbmm,\ -I$(realpath $(SRCDIR)/dbaccess/inc) \ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,dbmm,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_linked_libs,dbmm,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 7f8c6db47..61910cfa7 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -37,7 +37,11 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \ -I$(WORKDIR)/inc/dbaccess \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,dbu,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_set_defs,dbu,\ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index a93bc256b..5338fcf56 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -40,7 +40,11 @@ $(eval $(call gb_Library_set_include,sdbt,\ -I$(realpath $(SRCDIR)/dbaccess/source/inc/) \ -I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,sdbt,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_linked_libs,sdbt,\ diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 430f9d220..93e1adb5a 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,rpt,\ -I$(realpath $(SRCDIR)/reportdesign/source/inc) \ -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,rpt,\ @@ -44,6 +43,11 @@ $(eval $(call gb_Library_set_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,rpt,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,rpt,\ comphelper \ cppu \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index c532117ce..7aee950fa 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_include,rptui,\ -I$(realpath $(SRCDIR)/reportdesign/source/inc) \ -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,rptui,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_linked_libs,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index 8a0b6864c..ff9eb4436 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \ -I$(realpath $(SRCDIR)/reportdesign/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,rptxml,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,rptxml,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,rptxml,\ comphelper \ cppu \ -- cgit v1.2.3 From 9eff2f355be364babe6b838164edb178df1799a6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Jun 2011 00:56:38 +0100 Subject: adapt for new api --- reportdesign/source/ui/dlg/Formula.cxx | 2 +- reportdesign/source/ui/report/DesignView.cxx | 8 ++++---- reportdesign/source/ui/report/ReportController.cxx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 0f86b3dd3..0e150014e 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -101,7 +101,7 @@ FormulaDialog::~FormulaDialog() if ( m_pAddField ) { SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); - aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) ); + aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); ::std::auto_ptr aTemp2(m_pAddField); m_pAddField = NULL; diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 255735701..19dbb4c86 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -202,7 +202,7 @@ ODesignView::~ODesignView() if ( m_pAddField ) { SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); - aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) ); + aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); ::std::auto_ptr aTemp2(m_pAddField); m_pAddField = NULL; @@ -210,7 +210,7 @@ ODesignView::~ODesignView() if ( m_pReportExplorer ) { SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) ); - aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) ); + aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); ::std::auto_ptr aTemp2(m_pReportExplorer); m_pReportExplorer = NULL; @@ -559,7 +559,7 @@ void ODesignView::toggleReportExplorer() m_pReportExplorer = new ONavigator(this,rReportController); SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) ); if ( aDlgOpt.Exists() ) - m_pReportExplorer->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + m_pReportExplorer->SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pReportExplorer->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } @@ -596,7 +596,7 @@ void ODesignView::toggleAddField() m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) - m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pAddField->Update(); m_pAddField->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::AddWindow)); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index fe0f2a188..8d27bf873 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -350,7 +350,7 @@ void OReportController::disposing() if ( m_pGroupsFloater ) { SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) ); - aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) ); + aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); ::std::auto_ptr aTemp(m_pGroupsFloater); m_pGroupsFloater = NULL; } @@ -2551,7 +2551,7 @@ void OReportController::openSortingAndGroupingDialog() m_pGroupsFloater = new OGroupsSortingDialog(getView(),!isEditable(),this); SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) ); if ( aDlgOpt.Exists() ) - m_pGroupsFloater->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + m_pGroupsFloater->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pGroupsFloater->AddEventListener(LINK(this,OReportController,EventLstHdl)); } else if ( isUiVisible() ) -- cgit v1.2.3 From 899c4c6c65da6190d4b2317d69d3bdec7f721f8e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 27 May 2011 12:03:12 +0200 Subject: make this more readable --- dbaccess/source/core/api/CRowSetDataColumn.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 9e6bfe87d..0aa72ec7e 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -203,7 +203,7 @@ Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() throw (RuntimeExce void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue) { - if ( !m_aColumnValue.isNull() && m_aColumnValue->is() && (!(((*m_aColumnValue)->get())[m_nPos] == _rOldValue)) ) + if ( !m_aColumnValue.isNull() && m_aColumnValue->is() && (((*m_aColumnValue)->get())[m_nPos] != _rOldValue) ) { sal_Int32 nHandle = PROPERTY_ID_VALUE; m_aOldValue = _rOldValue.makeAny(); -- cgit v1.2.3 From 28656705357e042f0cd91084c7a3631b8967dd3b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 1 Jul 2011 15:44:20 +0300 Subject: Goodbye to CWS_WORK_STAMP --- reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java index 5238edf92..9c3c63229 100644 --- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java +++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java @@ -250,7 +250,6 @@ public class ReportDesignerTest private String m_sMailAddress = null; private String m_sUPDMinor; - private String m_sCWS_WORK_STAMP; private static final int WRITER = 1; private static final int CALC = 2; @@ -272,8 +271,6 @@ public class ReportDesignerTest System.out.println("Assumed mail address: " + m_sMailAddress); m_sUPDMinor = System.getProperty("UPDMINOR"); - m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP"); - System.out.println("Current CWS: " + m_sCWS_WORK_STAMP); System.out.println("Current MWS: " + m_sUPDMinor); // sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); @@ -383,11 +380,7 @@ public class ReportDesignerTest String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING ); System.out.println("DBConnection: " + sDBConnection); DB.init(sDBConnection); - String sDestinationVersion = m_sCWS_WORK_STAMP; - if (sDestinationVersion.length() == 0) - { - sDestinationVersion = m_sUPDMinor; - } + String sDestinationVersion = m_sUPDMinor; String sDestinationName = ""; String sDestinationCreatorType = ""; String sDocumentPoolDir = getOutputPath(_nType); -- cgit v1.2.3 From be20762e2e6c0c188ab15888564c318abd4ab759 Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sat, 2 Jul 2011 17:28:27 +0200 Subject: Move methods from component_getImplementationEnviron to component_getFactory --- dbaccess/source/core/misc/services.cxx | 3 ++- dbaccess/source/ext/adabas/Aservices.cxx | 3 ++- dbaccess/source/filter/xml/xmlservices.cxx | 3 ++- dbaccess/source/sdbtools/misc/sdbt_services.cxx | 3 ++- dbaccess/source/ui/misc/uiservices.cxx | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index dcd6278f4..578ea70cb 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -102,7 +102,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_DBA(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -112,6 +111,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* pRegistryKey) { + createRegistryInfo_DBA(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index 49d88f959..da16faf30 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -63,7 +63,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_adabasui(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -73,6 +72,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + createRegistryInfo_adabasui(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index a3410c4a4..b3000d614 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -74,7 +74,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_dbaxml(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -84,6 +83,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + createRegistryInfo_dbaxml(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index af6c1603e..88824cb1a 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -60,7 +60,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - sdbt_initializeModule(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -70,6 +69,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + sdbt_initializeModule(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 5a3eb62ad..12c5afe05 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -113,7 +113,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_DBU(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -123,6 +122,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + createRegistryInfo_DBU(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { -- cgit v1.2.3 From 382114821e93eb8db0d71cc4ecd5288de54e4c26 Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sun, 3 Jul 2011 12:22:32 +0200 Subject: Remove component_getImplementationEnvironment --- dbaccess/source/core/misc/services.cxx | 10 ---------- dbaccess/source/ext/adabas/Aservices.cxx | 10 ---------- dbaccess/source/ext/adabas/adabasui.dxp | 1 - dbaccess/source/ext/adabas/exports.dxp | 1 - dbaccess/source/filter/xml/xmlservices.cxx | 10 ---------- dbaccess/source/sdbtools/misc/sdbt_services.cxx | 10 ---------- dbaccess/source/ui/misc/uiservices.cxx | 10 ---------- reportdesign/source/core/api/services.cxx | 6 ------ reportdesign/source/filter/xml/xmlservices.cxx | 7 ------- reportdesign/source/ui/misc/rptuiservices.cxx | 7 ------- 10 files changed, 72 deletions(-) diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 578ea70cb..e68b525a1 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -95,16 +95,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() } } -//--------------------------------------------------------------------------------------- - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** - ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index da16faf30..5af5a4b15 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -56,16 +56,6 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui() } } -//--------------------------------------------------------------------------------------- - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** - ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/dbaccess/source/ext/adabas/adabasui.dxp b/dbaccess/source/ext/adabas/adabasui.dxp index 926e49f5f..4f567f9b2 100644 --- a/dbaccess/source/ext/adabas/adabasui.dxp +++ b/dbaccess/source/ext/adabas/adabasui.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_getFactory diff --git a/dbaccess/source/ext/adabas/exports.dxp b/dbaccess/source/ext/adabas/exports.dxp index f0e1c6993..700330789 100644 --- a/dbaccess/source/ext/adabas/exports.dxp +++ b/dbaccess/source/ext/adabas/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index b3000d614..83bc7c7fa 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -67,16 +67,6 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() } } -//--------------------------------------------------------------------------------------- - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** - ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 88824cb1a..9c726f8f9 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -53,16 +53,6 @@ extern "C" void SAL_CALL sdbt_initializeModule() } } -//--------------------------------------------------------------------------------------- - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** - ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 12c5afe05..120b2d890 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -106,16 +106,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBU() } } -//--------------------------------------------------------------------------------------- - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** - ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 21375491f..dfceea340 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -85,12 +85,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( implName, serviceManager, registryKey, entries); } -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - } // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 22f6eca8c..5b7163969 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -88,11 +88,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( implName, serviceManager, registryKey, entries); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index af53340de..d005870f9 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -76,11 +76,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( implName, serviceManager, registryKey, entries); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3 From d5012632cc0f5a53dcd4788ea58871100d8218aa Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 13 Jul 2011 17:56:47 +0200 Subject: Add prefixes for component_getFactory methods Also remove accidentally kept .dxp files from gnumake'd module --- dbaccess/source/core/misc/services.cxx | 2 +- dbaccess/source/ext/adabas/Aservices.cxx | 2 +- dbaccess/source/ext/adabas/adabasui.component | 2 +- dbaccess/source/ext/adabas/adabasui.dxp | 2 -- dbaccess/source/ext/adabas/exports.dxp | 1 - dbaccess/source/ext/macromigration/dbmm.component | 2 +- dbaccess/source/ext/macromigration/dbmm_services.cxx | 7 ++++++- dbaccess/source/filter/xml/dbaxml.component | 2 +- dbaccess/source/filter/xml/xmlservices.cxx | 2 +- dbaccess/source/sdbtools/misc/sdbt_services.cxx | 2 +- dbaccess/source/ui/misc/uiservices.cxx | 2 +- dbaccess/util/dba.component | 2 +- dbaccess/util/dbu.component | 2 +- dbaccess/util/sdbt.component | 2 +- reportdesign/source/core/api/services.cxx | 2 +- reportdesign/source/filter/xml/xmlservices.cxx | 2 +- reportdesign/source/ui/misc/rptuiservices.cxx | 2 +- reportdesign/util/rpt.component | 2 +- reportdesign/util/rptui.component | 2 +- reportdesign/util/rptxml.component | 2 +- 20 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 dbaccess/source/ext/adabas/adabasui.dxp delete mode 100644 dbaccess/source/ext/adabas/exports.dxp diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index e68b525a1..d0b90e172 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -96,7 +96,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey) diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index 5af5a4b15..51940d9e0 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -57,7 +57,7 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL adabasui_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/ext/adabas/adabasui.component b/dbaccess/source/ext/adabas/adabasui.component index e547a0cff..e9a79b1d5 100644 --- a/dbaccess/source/ext/adabas/adabasui.component +++ b/dbaccess/source/ext/adabas/adabasui.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/dbaccess/source/ext/adabas/adabasui.dxp b/dbaccess/source/ext/adabas/adabasui.dxp deleted file mode 100644 index 4f567f9b2..000000000 --- a/dbaccess/source/ext/adabas/adabasui.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getFactory - diff --git a/dbaccess/source/ext/adabas/exports.dxp b/dbaccess/source/ext/adabas/exports.dxp deleted file mode 100644 index 700330789..000000000 --- a/dbaccess/source/ext/adabas/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dbaccess/source/ext/macromigration/dbmm.component b/dbaccess/source/ext/macromigration/dbmm.component index a74e94510..cb91044f5 100644 --- a/dbaccess/source/ext/macromigration/dbmm.component +++ b/dbaccess/source/ext/macromigration/dbmm.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index b93ac5431..3999493ad 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -49,6 +49,11 @@ namespace dbmm } // namespace dbmm //........................................................................ -IMPLEMENT_COMPONENT_LIBRARY_API( ::dbmm::MacroMigrationModule, ::dbmm::initializeModule ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( + const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) +{ + ::dbmm::initializeModule(); + return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey ); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/dbaxml.component b/dbaccess/source/filter/xml/dbaxml.component index 23b3a5c1a..86816c9f2 100644 --- a/dbaccess/source/filter/xml/dbaxml.component +++ b/dbaccess/source/filter/xml/dbaxml.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 83bc7c7fa..d3095514f 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -68,7 +68,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 9c726f8f9..34d9fa1de 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -54,7 +54,7 @@ extern "C" void SAL_CALL sdbt_initializeModule() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 120b2d890..f9e001a1c 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -107,7 +107,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBU() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component index b25768dbf..5b5155a6c 100644 --- a/dbaccess/util/dba.component +++ b/dbaccess/util/dba.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/dbaccess/util/dbu.component b/dbaccess/util/dbu.component index ce0dc45cf..e5260ed16 100644 --- a/dbaccess/util/dbu.component +++ b/dbaccess/util/dbu.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/dbaccess/util/sdbt.component b/dbaccess/util/sdbt.component index 0038c0cad..9c0dec304 100644 --- a/dbaccess/util/sdbt.component +++ b/dbaccess/util/sdbt.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index dfceea340..f957b2890 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -78,7 +78,7 @@ cppu::ImplementationEntry entries[] = { extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL rpt_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 5b7163969..ca1996916 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -81,7 +81,7 @@ cppu::ImplementationEntry entries[] = { }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL rptxml_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index d005870f9..803d0d436 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -69,7 +69,7 @@ cppu::ImplementationEntry entries[] = { }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL rptui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component index ef5b2cc4c..20fc9d19c 100644 --- a/reportdesign/util/rpt.component +++ b/reportdesign/util/rpt.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/reportdesign/util/rptui.component b/reportdesign/util/rptui.component index 593f06d0b..e4d61aaca 100644 --- a/reportdesign/util/rptui.component +++ b/reportdesign/util/rptui.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component index 8a0021ecd..ccc4486b1 100644 --- a/reportdesign/util/rptxml.component +++ b/reportdesign/util/rptxml.component @@ -26,7 +26,7 @@ * **********************************************************************--> - -- cgit v1.2.3 From 38b843f876cb321bafb6c86609b3075c95a3773a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 14 Jul 2011 22:05:39 +0100 Subject: callcatcher: remove unused methods --- dbaccess/source/ui/control/FieldDescControl.cxx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 671f909c9..30d22b96e 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -100,20 +100,7 @@ using namespace ::com::sun::star::util; namespace { - // ----------------------------------------------------------------------------- - double checkDoubleForDateFormat(double _nValue,sal_Int32 _nFormatKey,const Reference< ::com::sun::star::util::XNumberFormatter>& _xNumberFormatter) - { - double nValue = _nValue; - sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE - || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) - { - nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue); - } - return nValue; - } - // ----------------------------------------------------------------------------- template< typename T1, typename T2> void lcl_HideAndDeleteControl(short& _nPos,T1** _pControl,T2** _pControlText) { if ( *_pControl ) -- cgit v1.2.3 From 8bcda4b58a531824a839d03db51c706347ca044b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 17 Jul 2011 22:57:17 +0100 Subject: ditch ByteString --- reportdesign/source/filter/xml/xmlfilter.cxx | 40 +++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index f489fd304..f63b81224 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -182,37 +182,35 @@ sal_Int32 ReadThroughComponent( { xParser->parseStream( aParserInput ); } - catch( SAXParseException& - -#if OSL_DEBUG_LEVEL > 1 -r -#endif -) + catch (const SAXParseException& r) { #if OSL_DEBUG_LEVEL > 1 - ByteString aError( "SAX parse exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - aError += ByteString::CreateFromInt32( r.LineNumber ); - aError += ','; - aError += ByteString::CreateFromInt32( r.ColumnNumber ); - - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "SAX parse exception caught while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + aError.append(r.LineNumber); + aError.append(','); + aError.append(r.ColumnNumber); + OSL_FAIL(aError.getStr()); +#else + (void)r; #endif return 1; } - catch( SAXException& ) + catch (const SAXException&) { return 1; } - catch( packages::zip::ZipIOException& ) + catch (const packages::zip::ZipIOException&) { return ERRCODE_IO_BROKENPACKAGE; } - catch( IOException& ) + catch (const IOException&) { return 1; } - catch( Exception& ) + catch (const Exception&) { return 1; } @@ -266,11 +264,11 @@ sal_Int32 ReadThroughComponent( uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW ); xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncrypted; } - catch( packages::WrongPasswordException& ) + catch (const packages::WrongPasswordException&) { return ERRCODE_SFX_WRONGPASSWORD; } - catch ( uno::Exception& ) + catch (const uno::Exception&) { return 1; // TODO/LATER: error handling } @@ -517,7 +515,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { xStorage = pMedium->GetStorage(); } - catch(const Exception&) + catch (const Exception&) { } } @@ -594,7 +592,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { xProp->setPropertyValue(s_sOld,uno::makeAny(!(xStorage->hasByName(s_sMeta) || xStorage->isStreamElement( s_sMeta )))); } - catch(uno::Exception&) + catch (const uno::Exception&) { xProp->setPropertyValue(s_sOld,uno::makeAny(sal_True)); } -- cgit v1.2.3 From aea73ba0af0bcf626306ffd0e7b00042c13c2dac Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 19 Jul 2011 21:50:47 +0100 Subject: ByteString::CreateFromAscii->rtl::OStringBuffer::valueOf --- dbaccess/source/filter/xml/xmlfilter.cxx | 46 +++++++++++++++----------------- dbaccess/source/ui/dlg/dbfindex.cxx | 13 +++++---- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 8857c55f2..383fc29a4 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -120,9 +120,8 @@ namespace dbaxml { ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM(m_xFactory); } - catch(uno::Exception& ex) + catch (const uno::Exception&) { - (void)ex; OSL_ASSERT(0); } } @@ -167,9 +166,8 @@ namespace dbaxml ::comphelper::disposeComponent(xModel); } } - catch(uno::Exception& ex) + catch (const uno::Exception&) { - (void)ex; OSL_ASSERT(0); } } @@ -268,33 +266,31 @@ sal_Int32 ReadThroughComponent( { xParser->parseStream( aParserInput ); } -#if OSL_DEBUG_LEVEL > 1 - catch( SAXParseException& r ) + catch (const SAXParseException& r) { - ByteString aError( "SAX parse exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - aError += ByteString::CreateFromInt32( r.LineNumber ); - aError += ','; - aError += ByteString::CreateFromInt32( r.ColumnNumber ); - - OSL_FAIL( aError.GetBuffer() ); - return 1; - } +#if OSL_DEBUG_LEVEL > 1 + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "SAX parse exception catched while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + aError.append(r.LineNumber); + aError.append(','); + aError.append(r.ColumnNumber); + OSL_FAIL(aError.getStr()); #else - catch( SAXParseException& ) - { + (void)r; +#endif return 1; } -#endif - catch( SAXException& ) + catch (const SAXException&) { return 1; } - catch( packages::zip::ZipIOException& ) + catch (const packages::zip::ZipIOException&) { return ERRCODE_IO_BROKENPACKAGE; } - catch( Exception& ) + catch (const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -346,11 +342,11 @@ sal_Int32 ReadThroughComponent( uno::Any aAny = xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ); aAny >>= bEncrypted; } - catch( packages::WrongPasswordException& ) + catch (const packages::WrongPasswordException&) { return ERRCODE_SFX_WRONGPASSWORD; } - catch ( uno::Exception& ) + catch (const uno::Exception&) { return 1; // TODO/LATER: error handling } @@ -457,7 +453,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { xStorage.set( pMedium->GetStorage( sal_False ), UNO_QUERY_THROW ); } - catch( const Exception& ) + catch (const Exception&) { Any aError = ::cppu::getCaughtException(); if ( aError.isExtractableTo( ::cppu::UnoType< RuntimeException >::get() ) ) @@ -908,7 +904,7 @@ void ODBFilter::setPropertyInfo() { xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(aInfo)); } - catch(const Exception&) + catch (const Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 9a593cd26..6403be25f 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -42,6 +42,7 @@ #include #include #include +#include //......................................................................... @@ -493,14 +494,13 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const // Erst einmal alle Tabellenindizes loeschen ByteString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - ByteString aKeyName; ByteString aEntry; sal_uInt16 nKey = 0; while( nKey < nKeyCnt ) { // Verweist der Key auf ein Indexfile?... - aKeyName = aInfFile.GetKeyName( nKey ); + ByteString aKeyName = aInfFile.GetKeyName( nKey ); aNDX = aKeyName.Copy(0,3); //...wenn ja, Indexfile loeschen, nKey steht dann auf nachfolgendem Key @@ -521,10 +521,13 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const ++aIndex, ++nPos ) { - aKeyName = "NDX"; + rtl::OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); if( nPos > 0 ) // Erster Index erhaelt keine Ziffer - aKeyName += ByteString::CreateFromInt32( nPos ); - aInfFile.WriteKey( aKeyName, ByteString(aIndex->GetIndexFileName(), gsl_getSystemTextEncoding()) ); + aKeyName.append(static_cast(nPos)); + aInfFile.WriteKey( + aKeyName.makeStringAndClear(), + rtl::OUStringToOString(aIndex->GetIndexFileName(), + gsl_getSystemTextEncoding())); } aInfFile.Flush(); -- cgit v1.2.3