[Libreoffice-commits] .: Branch 'gr2' - 3 commits - dbaccess/source reportdesign/source
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 00:03:55 PST 2011
dbaccess/source/core/dataaccess/datasource.cxx | 2 +-
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2 +-
dbaccess/source/ui/browser/formadapter.cxx | 8 ++++----
dbaccess/source/ui/browser/sbabrw.src | 2 --
dbaccess/source/ui/browser/unodatbr.cxx | 2 +-
dbaccess/source/ui/dlg/dlgattr.src | 1 -
dbaccess/source/ui/dlg/queryfilter.src | 1 -
dbaccess/source/ui/dlg/queryorder.src | 1 -
dbaccess/source/ui/inc/DExport.hxx | 4 +---
dbaccess/source/ui/inc/TableCopyHelper.hxx | 4 ++--
dbaccess/source/ui/inc/TokenWriter.hxx | 6 ++----
dbaccess/source/ui/inc/WCPage.hxx | 2 --
dbaccess/source/ui/misc/TableCopyHelper.cxx | 3 +--
dbaccess/source/ui/misc/TokenWriter.cxx | 2 --
reportdesign/source/ui/dlg/dlgpage.src | 4 ----
15 files changed, 13 insertions(+), 31 deletions(-)
New commits:
commit 14b3638399d2665b4fc1d69eb3a74d1f726b9153
Author: J. Graeme Lingard <jgraeme+git at gmail.com>
Date: Sat Mar 5 18:05:38 2011 +0000
Remove 'added by' comments
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 34ff81b..8a68652 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -165,10 +165,8 @@ namespace dbaui
);
void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);
-
- //dyf add 20070601
+
inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }
- //dyf add end
virtual void release() = 0;
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 7787398..bedd9b2 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -81,10 +81,10 @@ namespace dbaui
struct DropDescriptor
{
::svx::ODataAccessDescriptor aDroppedData;
- //dyf add 20070601
+
//for transfor the tablename
::rtl::OUString sDefaultTableName;
- //dyf add end
+
String aUrl;
SotStorageStreamRef aHtmlRtfStorage;
ElementType nType;
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 9b5aa78..5001f73 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -84,10 +84,10 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;
::rtl::OUString m_sName;
- //dyf add 20070601
+
//for transfor the tablename
::rtl::OUString m_sDefaultTableName;
- //dyf add end
+
::rtl::OUString m_sDataSourceName;
sal_Int32 m_nCommandType;
bool m_bNeedToReInitialize;
@@ -121,10 +121,8 @@ namespace dbaui
public:
void setStream(SvStream* _pStream){ m_pStream = _pStream; }
- //dyf add 20070601
//for set the tablename
void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; }
- //dyf add end
virtual BOOL Write(); // Export
virtual BOOL Read(); // Import
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index c683e6b..10d9ed4 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -70,9 +70,7 @@ namespace dbaui
DECL_LINK( KeyClickHdl, Button* );
sal_Bool checkAppendData();
- //--------dyf add
void SetAppendDataRadio();
- //--------add end
public:
virtual void Reset();
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index bf7d385..15e1e42 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -266,10 +266,9 @@ sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc
if ( _bCheck )
pImport->enableCheckOnly();
- //dyf add 20070601
//set the selected tablename
pImport->setSTableName(_rDesc.sDefaultTableName);
- //dyf add end
+
pImport->setStream(pStream);
return pImport->Read();
}
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index f57061b..ed1c3ea 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -736,9 +736,7 @@ BOOL OHTMLImportExport::Read()
((OHTMLReader*)m_pReader)->AddRef();
if ( isCheckEnabled() )
m_pReader->enableCheckOnly();
- //dyf add 20070601
m_pReader->SetTableName(m_sDefaultTableName);
- //dyf add end
eState = ((OHTMLReader*)m_pReader)->CallParser();
m_pReader->release();
m_pReader = NULL;
commit 863a90f3811d1b2f68c7e14627a22f5357bfa464
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Fri Mar 4 22:17:03 2011 +0100
Removed /* ### ACHTUNG: Neuer Text in Resource? - lines from base
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 2a748cc..87f2f95 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -42,14 +42,12 @@ QueryBox QUERY_BRW_SAVEMODIFIED
{
Buttons = WB_YES_NO_CANCEL ;
DefButton = WB_DEF_YES ;
- /* ### ACHTUNG: Neuer Text in Resource? Soll der geänderte Datensatz gespeichert werden? : Soll der geänderte Datensatz gespeichert werden? */
Message [ en-US ] = "The current record has been changed.\nDo you want to save the changes?" ;
};
QueryBox QUERY_BRW_DELETE_ROWS
{
Buttons = WB_YES_NO ;
- /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten gelöscht werden? : Sollen die selektierten Daten gel÷scht werden? */
Message [ en-US ] = "Do you want to delete the selected data?" ;
};
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index a1f689b..4ed8c1c 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -74,7 +74,6 @@ TabDialog DLG_ATTR
};
String TP_ATTR_CHAR
{
- /* ### ACHTUNG: Neuer Text in Resource? Schrift : Zeichen */
Text [ en-US ] = "Font" ;
};
String TP_ATTR_NUMBER
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index 6001932..f93fe24 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -170,7 +170,6 @@ ModalDialog DLG_FILTERCRIT
{
Pos = MAP_APPFONT ( 15 , 14 ) ;
Size = MAP_APPFONT ( 40 , 8 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Verknüpfung : Verkn³pfung */
Center = TRUE ;
Text [ en-US ] = "Operator" ;
};
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index fe75042..318df30 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -133,7 +133,6 @@ ModalDialog DLG_ORDERCRIT
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 46 , 8 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Verknüpfung : Verkn³pfung */
Text [ en-US ] = "Operator" ;
};
FixedText FT_ORDERDIR
diff --git a/reportdesign/source/ui/dlg/dlgpage.src b/reportdesign/source/ui/dlg/dlgpage.src
index 78873f1..92407c0 100644
--- a/reportdesign/source/ui/dlg/dlgpage.src
+++ b/reportdesign/source/ui/dlg/dlgpage.src
@@ -79,7 +79,6 @@ TabDialog RID_PAGEDIALOG_PAGE
{
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */
Text [ en-US ] = "Return" ;
TabStop = TRUE ;
};
@@ -129,7 +128,6 @@ TabDialog RID_PAGEDIALOG_BACKGROUND
{
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */
Text [ en-US ] = "Return" ;
TabStop = TRUE ;
Text [ x-comment ] = " ";
@@ -218,7 +216,6 @@ TabDialog RID_PAGEDIALOG_CHAR
{
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */
Text [ en-US ] = "Return" ;
TabStop = TRUE ;
Text [ x-comment ] = " ";
@@ -290,7 +287,6 @@ TabDialog RID_PAGEDIALOG_LINE
{
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */
Text [ en-US ] = "Return" ;
TabStop = TRUE ;
Text [ x-comment ] = " ";
commit b30fa40eaa77b4065ad28f38b3ca6ff3dcd8f19b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 17:52:28 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 6ebe5d5..1cabbf2 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -273,7 +273,7 @@ Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getReme
void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) throw(RuntimeException)
{
- DBG_ERROR("OAuthenticationContinuation::setRememberAccount: not supported!");
+ OSL_FAIL("OAuthenticationContinuation::setRememberAccount: not supported!");
}
/** The class OSharedConnectionManager implements a structure to share connections.
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 9b5df75..6ab3772 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -744,7 +744,7 @@ namespace
}
catch( Exception& )
{
- DBG_ERROR( "LayoutManagerLock::~LayoutManagerLock: caught an exception!" );
+ OSL_FAIL( "LayoutManagerLock::~LayoutManagerLock: caught an exception!" );
}
}
};
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index eeee6b7..75062e1 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -1086,19 +1086,19 @@ sal_Bool SAL_CALL SbaXFormAdapter::getGroupControl() throw( RuntimeException )
// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException )
{
- DBG_ERROR("SAL_CALL SbaXFormAdapter::setGroupControl : not supported !");
+ OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroupControl : not supported !");
}
// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*Controls*/) throw( RuntimeException )
{
- DBG_ERROR("SAL_CALL SbaXFormAdapter::setControlModels : not supported !");
+ OSL_FAIL("SAL_CALL SbaXFormAdapter::setControlModels : not supported !");
}
// -------------------------------------------------------------------------
Sequence< Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL SbaXFormAdapter::getControlModels() throw( RuntimeException )
{
- DBG_ERROR("SAL_CALL SbaXFormAdapter::getControlModels : not supported !");
+ OSL_FAIL("SAL_CALL SbaXFormAdapter::getControlModels : not supported !");
return Sequence< Reference< ::com::sun::star::awt::XControlModel > >();
}
@@ -1111,7 +1111,7 @@ void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< ::com::sun::s
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL SbaXFormAdapter::getGroupCount() throw( RuntimeException )
{
- DBG_ERROR("SAL_CALL SbaXFormAdapter::getGroupCount : not supported !");
+ OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupCount : not supported !");
return 0;
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index fe4225d..8654970 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2264,7 +2264,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry )
break;
default:
- DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: ooops ... missing some implementation here!");
+ OSL_FAIL("SbaTableQueryBrowser::ensureEntryObject: ooops ... missing some implementation here!");
// TODO ...
break;
}
More information about the Libreoffice-commits
mailing list