diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/uibase/fldui/xfldui.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/uibase/fldui/xfldui.cxx')
| -rw-r--r-- | sw/source/uibase/fldui/xfldui.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx index adc4f9cb91b0..5bf5b738ac9f 100644 --- a/sw/source/uibase/fldui/xfldui.cxx +++ b/sw/source/uibase/fldui/xfldui.cxx @@ -47,8 +47,8 @@ using namespace ::com::sun::star::beans; // Is the database field numeric? // remark: in case of error true is returned -bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName, - bool bIsTable, const OUString& rFldName) +bool SwFieldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTableQryName, + bool bIsTable, const OUString& rFieldName) { bool bNumeric = true; @@ -68,11 +68,11 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName Reference<XTablesSupplier> xTSupplier = Reference<XTablesSupplier>(xConnection, UNO_QUERY); if(xTSupplier.is()) { - Reference<XNameAccess> xTbls = xTSupplier->getTables(); - OSL_ENSURE(xTbls->hasByName(rTblQryName), "table not available anymore?"); + Reference<XNameAccess> xTables = xTSupplier->getTables(); + OSL_ENSURE(xTables->hasByName(rTableQryName), "table not available anymore?"); try { - Any aTable = xTbls->getByName(rTblQryName); + Any aTable = xTables->getByName(rTableQryName); Reference<XPropertySet> xPropSet; aTable >>= xPropSet; xColsSupplier = Reference<XColumnsSupplier>(xPropSet, UNO_QUERY); @@ -88,10 +88,10 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName if(xQSupplier.is()) { Reference<XNameAccess> xQueries = xQSupplier->getQueries(); - OSL_ENSURE(xQueries->hasByName(rTblQryName), "table not available anymore?"); + OSL_ENSURE(xQueries->hasByName(rTableQryName), "table not available anymore?"); try { - Any aQuery = xQueries->getByName(rTblQryName); + Any aQuery = xQueries->getByName(rTableQryName); Reference<XPropertySet> xPropSet; aQuery >>= xPropSet; xColsSupplier = Reference<XColumnsSupplier>(xPropSet, UNO_QUERY); @@ -113,9 +113,9 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName { OSL_FAIL("Exception in getColumns()"); } - if(xCols.is() && xCols->hasByName(rFldName)) + if(xCols.is() && xCols->hasByName(rFieldName)) { - Any aCol = xCols->getByName(rFldName); + Any aCol = xCols->getByName(rFieldName); Reference <XPropertySet> xCol; aCol >>= xCol; Any aType = xCol->getPropertyValue("Type"); |