[Libreoffice-commits] core.git: dbaccess/source reportdesign/source
dbaccess/source/ui/app/AppView.hxx |1 -
dbaccess/source/ui/inc/callbacks.hxx |2 --
reportdesign/source/ui/inc/GroupsSorting.hxx |2 --
3 files changed, 5 deletions(-)
New commits:
commit d43c1b9b88eeb800eaff4d63605892dc859d4f72
Author: Caolán McNamara
AuthorDate: Thu Aug 5 14:22:19 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 5 17:37:42 2021 +0200
drop unneeded forward declares of Control
Change-Id: I033fabfc0e40ddac093c3cae34fccea0647ebd24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120071
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/app/AppView.hxx
b/dbaccess/source/ui/app/AppView.hxx
index b3a5706c54b5..59a6d477a367 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -30,7 +30,6 @@
namespace com::sun::star::beans{ class XPropertySet; }
-class Control;
class MnemonicGenerator;
namespace dbaui
diff --git a/dbaccess/source/ui/inc/callbacks.hxx
b/dbaccess/source/ui/inc/callbacks.hxx
index 38e419b5b289..e380b2671d6c 100644
--- a/dbaccess/source/ui/inc/callbacks.hxx
+++ b/dbaccess/source/ui/inc/callbacks.hxx
@@ -22,8 +22,6 @@
#include
class Point;
-class PopupMenu;
-class Control;
struct AcceptDropEvent;
struct ExecuteDropEvent;
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx
b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 7b465a5a2034..0418ee1d9abb 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -28,8 +28,6 @@
#include
#include
-class Control;
-
namespace comphelper
{
class OPropertyChangeMultiplexer;
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source
dbaccess/source/core/api/TableDeco.cxx |6 +++---
dbaccess/source/core/api/definitioncolumn.cxx |6 +++---
dbaccess/source/core/api/table.cxx |6 +++---
dbaccess/source/core/api/tablecontainer.cxx|6 +++---
dbaccess/source/core/inc/definitioncolumn.hxx |2 +-
reportdesign/source/core/api/ReportVisitor.cxx |2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 0e27b1f364d9b36cb5f8431d9df36b5953237424
Author: Andrea Gelmini
AuthorDate: Mon Aug 31 16:55:29 2020 +0200
Commit: Julien Nabet
CommitDate: Tue Sep 15 08:15:03 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: Ibb705ac92365b7f71e8e5561bd150142a65a50ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101807
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/dbaccess/source/core/api/TableDeco.cxx
b/dbaccess/source/core/api/TableDeco.cxx
index b8a8da27371e..702723676c97 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -571,11 +571,11 @@ OColumn* ODBTableDecorator::createColumn(const OUString&
_rName) const
{
Reference xProp(xNames->getByName(_rName),UNO_QUERY);
-Reference xColumnDefintion;
+Reference xColumnDefinition;
if ( m_xColumnDefinitions.is() &&
m_xColumnDefinitions->hasByName(_rName))
-
xColumnDefintion.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
+
xColumnDefinition.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
-pReturn = new OTableColumnWrapper( xProp, xColumnDefintion, false
);
+pReturn = new OTableColumnWrapper( xProp, xColumnDefinition, false
);
}
}
return pReturn;
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx
b/dbaccess/source/core/api/definitioncolumn.cxx
index 84d1197bda20..7854a97f1816 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -559,16 +559,16 @@ void
OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast(
}
// OTableColumnWrapper
-OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >&
rCol, const Reference< XPropertySet >& _xColDefintion,
+OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >&
rCol, const Reference< XPropertySet >& _xColDefinition,
const bool _bPureWrap )
:OTableColumnDescriptorWrapper( rCol, _bPureWrap, false )
{
osl_atomic_increment( &m_refCount );
-if ( _xColDefintion.is() )
+if ( _xColDefinition.is() )
{
try
{
-::comphelper::copyProperties( _xColDefintion, this );
+::comphelper::copyProperties( _xColDefinition, this );
}
catch( const Exception& )
{
diff --git a/dbaccess/source/core/api/table.cxx
b/dbaccess/source/core/api/table.cxx
index d9b8f4484f5e..1fb27cd87fea 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -100,10 +100,10 @@ OColumn* ODBTable::createColumn(const OUString& _rName)
const
xProp.set(pColumns->createBaseObject(_rName),UNO_QUERY);
}
-Reference xColumnDefintion;
+Reference xColumnDefinition;
if ( m_xColumnDefinitions.is() && m_xColumnDefinitions->hasByName(_rName) )
-
xColumnDefintion.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
-pReturn = new OTableColumnWrapper( xProp, xColumnDefintion, false );
+
xColumnDefinition.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
+pReturn = new OTableColumnWrapper( xProp, xColumnDefinition, false );
return pReturn;
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx
b/dbaccess/source/core/api/tablecontainer.cxx
index bc32774fd891..61405b41e464 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -128,7 +128,7 @@ IMPLEMENT_SERVICE_INFO2(OTableContainer,
"com.sun.star.sdb.dbaccess.OTableContai
namespace
{
-void lcl_createDefintionObject(const OUString& _rName
+void lcl_createDefinitionObject(const OUString& _rName
,const Reference< XNameContainer >&
_xTableDefinitions
,Reference& _xTableDefinition
,Reference& _xColumnDefinitions)
@@ -162,7 +162,7 @@ connectivity::sdbcx::ObjectType
OTableContainer::createObject(const OUString& _r
{
Reference xTableDefinition;
Reference xColumnDefinitions;
-
lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
+
lcl_createDefinitionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
if ( xSup.is() )
{
@@ -288,7 +288,7 @@ ObjectType OTableContainer::appendObject( const OUString&
_rForName, const Refer
Reference xTableDefinition;
R
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source
dbaccess/source/ui/inc/QueryDesignView.hxx|2 +-
dbaccess/source/ui/inc/QueryViewSwitch.hxx|2 +-
dbaccess/source/ui/inc/querycontainerwindow.hxx |2 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx|6 +++---
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx|4 ++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |2 +-
dbaccess/source/ui/querydesign/querycontroller.cxx|2 +-
reportdesign/source/ui/report/ReportController.cxx|6 +++---
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 578dc3477011e4bdcaf703533c1def9d55000de4
Author: Andrea Gelmini
AuthorDate: Mon Aug 31 16:58:58 2020 +0200
Commit: Julien Nabet
CommitDate: Tue Sep 1 10:34:18 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: I3482e32e3ce4a7ebfa04f9d54e2ab23c164f50c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101808
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx
b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 4f057178669c..abdaed8912f4 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -100,7 +100,7 @@ namespace dbaui
bool isSlotEnabled(sal_Int32 _nSlotId);
void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
-void setNoneVisbleRow(sal_Int32 _nRows);
+void setNoneVisibleRow(sal_Int32 _nRows);
const css::lang::Locale& getLocale() const { return
m_aLocale;}
const OUString& getDecimalSeparator() const { return
m_sDecimalSep;}
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 879c29b01d42..70ff371a8a64 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -72,7 +72,7 @@ namespace dbaui
void forceInitialView();
bool isSlotEnabled(sal_Int32 _nSlotId);
void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
-void setNoneVisbleRow(sal_Int32 _nRows);
+void setNoneVisibleRow(sal_Int32 _nRows);
void SaveUIConfig();
void reset();
void GrabFocus();
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx
b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 607a38c82920..cb44f025bba2 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -76,7 +76,7 @@ namespace dbaui
void clear(){
m_pViewSwitch->clear(); }
bool isSlotEnabled( sal_Int32 _nSlotId ){
return m_pViewSwitch->isSlotEnabled( _nSlotId ); }
void setSlotEnabled( sal_Int32 _nSlotId, bool _bEnable ){
m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); }
-void setNoneVisbleRow(sal_Int32 _nRows) {
m_pViewSwitch->setNoneVisbleRow( _nRows); }
+void setNoneVisibleRow(sal_Int32 _nRows) {
m_pViewSwitch->setNoneVisibleRow( _nRows); }
bool checkStatement() {
return m_pViewSwitch->checkStatement( ); }
OUString getStatement() { return
m_pViewSwitch->getStatement( ); }
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index f605e8fb58d4..487d6bce42ce 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2427,7 +2427,7 @@ OQueryDesignView::OQueryDesignView(
OQueryContainerWindow* _pParent,
m_pSelectionBox = VclPtr::Create(this);
-
setNoneVisbleRow(static_cast(getController()).getVisibleRows());
+
setNoneVisibleRow(static_cast(getController()).getVisibleRows());
m_pSelectionBox->Show();
// setup Splitter
m_aSplitter->SetSplitHdl(LINK(this, OQueryDesignView,SplitHdl));
@@ -3009,9 +3009,9 @@ void OQueryDesignView::reset()
m_pTableView->ReSync();
}
-void OQueryDesignView::setNoneVisbleRow(sal_Int32 _nRows)
+void OQueryDesignView::setNoneVisibleRow(sal_Int32 _nRows)
{
-m_pSelectionBox->SetNoneVisbleRow(_nRows);
+m_pSelectionBox->SetNoneVisibleRow(_nRows);
}
void OQueryDesignView::initByFieldDescriptions( const Sequence< PropertyValue
>& i_rFieldDescriptions )
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 626a1f346e44..fec372e29038 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -284,10 +284,10 @@ void OQueryViewSwitch::reset()
switchView( nullptr );
}
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source sax/source xmloff/source
dbaccess/source/filter/xml/xmlComponent.cxx |2 +-
dbaccess/source/filter/xml/xmlTable.cxx |2 +-
reportdesign/source/filter/xml/xmlCell.cxx |2 ++
reportdesign/source/filter/xml/xmlColumn.cxx|2 ++
reportdesign/source/filter/xml/xmlComponent.cxx |3 +++
reportdesign/source/filter/xml/xmlComponent.hxx |2 ++
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx |9 -
reportdesign/source/filter/xml/xmlCondPrtExpr.hxx |5 +++--
reportdesign/source/filter/xml/xmlControlProperty.cxx |7 +--
reportdesign/source/filter/xml/xmlControlProperty.hxx |2 ++
reportdesign/source/filter/xml/xmlFixedContent.cxx | 12 ++--
reportdesign/source/filter/xml/xmlFixedContent.hxx |8
reportdesign/source/filter/xml/xmlFormatCondition.cxx |2 ++
reportdesign/source/filter/xml/xmlFormattedField.cxx|2 ++
reportdesign/source/filter/xml/xmlFunction.cxx |2 ++
reportdesign/source/filter/xml/xmlGroup.cxx |2 ++
reportdesign/source/filter/xml/xmlImage.cxx |1 +
reportdesign/source/filter/xml/xmlMasterFields.cxx |2 ++
reportdesign/source/filter/xml/xmlReport.cxx|4 +++-
reportdesign/source/filter/xml/xmlReport.hxx|2 +-
reportdesign/source/filter/xml/xmlReportElement.cxx |2 ++
reportdesign/source/filter/xml/xmlReportElementBase.cxx |8
reportdesign/source/filter/xml/xmlReportElementBase.hxx |2 --
reportdesign/source/filter/xml/xmlSection.cxx |4 ++--
reportdesign/source/filter/xml/xmlSubDocument.cxx |4 ++--
reportdesign/source/filter/xml/xmlSubDocument.hxx |6 --
reportdesign/source/filter/xml/xmlTable.cxx |2 ++
sax/source/fastparser/fastparser.cxx|5 +
xmloff/source/text/txtparai.cxx |2 ++
29 files changed, 73 insertions(+), 35 deletions(-)
New commits:
commit db7df91ea05f9093955583f165e32e218364fec3
Author: Noel Grandin
AuthorDate: Tue Feb 25 19:06:32 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Feb 29 12:04:55 2020 +0100
tdf#130878 Report does not show label-fields
The critical part was
(1) calling m_pFixedContent->Characters instead of
m_pFixedContent->characters in OXMLCharContent
(2) calling OXMLReportElementBase::EndElement instead of
OXMLReportElementBase::endFastElement in OXMLFixedContent
Also
(3) add a bunch of debugging logging to help find this
(4) fix various characters() methods that can no longer
rely on being called once for text content in a node
Change-Id: Ib8ea88c5ff377311ca70e4292cad6d1f7f7c7323
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89589
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx
b/dbaccess/source/filter/xml/xmlComponent.cxx
index c842d0c3ccd8..33bc12f00731 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -70,7 +70,7 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
m_bAsTemplate = sValue == s_sTRUE;
break;
default:
-SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString());
}
}
if ( !m_sHREF.isEmpty() && !m_sName.isEmpty() && _xParentContainer.is() )
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx
b/dbaccess/source/filter/xml/xmlTable.cxx
index 92c8fb680ff7..edcc68618f13 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -81,7 +81,7 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
m_bApplyOrder = sValue == "true";
break;
default:
-SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" <<
aIter.toString());
+SAL_WARN("dbaccess", "unknown attribute " <<
SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString());
}
}
uno::Sequence aArguments(comphelper::InitAnyPropertySequence(
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx
b/reportdesign/source/filter/xml/xmlCell.cxx
index 395c3afbd610..1ea03cd47a11 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include "xmlTable.hxx"
#include "xmlFormattedField.hxx"
@@ -76,6 +77,7 @@ OXMLCell::OXMLCell( ORptFilter& rImport
m_pContainer->setRowSpanned(sValue.toInt32());
brea
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source sfx2/source
dbaccess/source/ui/browser/dataview.cxx |1 -
dbaccess/source/ui/dlg/indexdialog.cxx |1 -
dbaccess/source/ui/dlg/tablespage.cxx|1 -
reportdesign/source/ui/dlg/AddField.cxx |2 --
reportdesign/source/ui/dlg/Condition.cxx |1 -
reportdesign/source/ui/dlg/GroupsSorting.cxx |1 -
sfx2/source/appl/newhelp.cxx |1 -
7 files changed, 8 deletions(-)
New commits:
commit f3a63a7a20f3d8fbcc850827c6db61bed0c12830
Author: Caolán McNamara
AuthorDate: Mon Dec 2 15:13:17 2019 +
Commit: Caolán McNamara
CommitDate: Tue Dec 3 21:05:02 2019 +0100
drop some unnecessary includes
Change-Id: Ic88ed0d36f1aae9f32a0097354042526fc18d649
Reviewed-on: https://gerrit.libreoffice.org/84244
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/source/ui/browser/dataview.cxx
b/dbaccess/source/ui/browser/dataview.cxx
index 114c7e0dfb03..83cda7b2f2ef 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index a4e75d116ac9..fd27f35efbdd 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -33,7 +33,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index 55e8fd4de580..7ea6f0050c05 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -43,7 +43,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/reportdesign/source/ui/dlg/AddField.cxx
b/reportdesign/source/ui/dlg/AddField.cxx
index 40a709432f2e..b24849e9a8ce 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -41,8 +41,6 @@
#include
#include
#include
-#include
-#include
namespace rptui
{
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index 5676b6b91017..f76fe4935d69 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -39,7 +39,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index d7edc6622c2a..67234233bf7e 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 7e0dcbc33c33..cddd4318cea6 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -90,7 +90,6 @@
#include
#include
#include
-#include
#include
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source svx/source
dbaccess/source/ui/browser/sbagrid.cxx|6 +++---
dbaccess/source/ui/tabledesign/TEditControl.cxx |2 +-
dbaccess/source/ui/tabledesign/TableDesignControl.cxx |2 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx |2 +-
svx/source/fmcomp/gridctrl.cxx|2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d143e211b1416665d77cd1914dd7f6a6b0b4f72a
Author: Lionel Elie Mamane
AuthorDate: Thu Oct 4 19:33:14 2018 +0200
Commit: Lionel Elie Mamane
CommitDate: Wed Oct 10 14:51:12 2018 +0200
clean up column pos vs column id
everywhere GetColumnAtXPosPixel is used;
see also tdf#119564 fix
Change-Id: Ibab57c7305bf4dce9ea9f3df66e6214b0d1585b2
Reviewed-on: https://gerrit.libreoffice.org/61390
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index 9f5709f34782..9f80745f3a11 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1253,8 +1253,8 @@ sal_Int8 SbaGridControl::AcceptDrop( const
BrowserAcceptDropEvent& rEvt )
// without an empty row we're not in update mode
break;
-longnRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false);
-sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X());
+const longnRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false);
+const sal_uInt16 nCol =
GetColumnId(GetColumnAtXPosPixel(rEvt.maPosPixel.X()));
long nCorrectRowCount = GetRowCount();
if (GetOptions() & DbGridControlOptions::Insert)
@@ -1262,7 +1262,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const
BrowserAcceptDropEvent& rEvt )
if (IsCurrentAppending())
--nCorrectRowCount; // the current data record doesn't really
exist, we are appending a new one
-if ((nCol == BROWSER_INVALIDID) || (nRow >= nCorrectRowCount) ||
GetColumnId(nCol) == 0 || GetColumnId(nCol) == BROWSER_INVALIDID )
+if ((nCol == BROWSER_INVALIDID) || (nRow >= nCorrectRowCount) || nCol
== 0 || nCol == BROWSER_INVALIDID )
// no valid cell under the mouse cursor
break;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 03936e7611f6..2dc9d91345c0 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1337,7 +1337,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
// Show the Context menu
if( !IsReadOnly() )
{
-sal_uInt16 nColId = GetColumnAtXPosPixel(aMenuPos.X());
+sal_uInt16 nColId =
GetColumnId(GetColumnAtXPosPixel(aMenuPos.X()));
long nRow = GetRowAtYPosPixel(aMenuPos.Y());
if ( HANDLE_ID != nColId )
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 2816a400716c..fd661a107066 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -103,7 +103,7 @@ void OTableRowView::Command(const CommandEvent& rEvt)
return;
}
-sal_uInt16 nColId =
GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X());
+sal_uInt16 nColId =
GetColumnId(GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X()));
long nRow = GetRowAtYPosPixel(rEvt.GetMousePosPixel().Y());
if ( nColId == HANDLE_ID )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 6e2e741abf8d..cbaa45f0361c 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -695,7 +695,7 @@ void OFieldExpressionControl::Command(const CommandEvent&
rEvt)
return;
}
-sal_uInt16 nColId =
GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X());
+sal_uInt16 nColId =
GetColumnId(GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X()));
if ( nColId == HANDLE_ID )
{
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9d56cc434cbe..79fa0339f7b3 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2754,7 +2754,7 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/,
const Point& rPosPixel )
if (!m_pSeekCursor || IsResizing())
return;
-sal_uInt16 nColId = GetColumnAtXPosPixel(rPosPixel.X());
+sal_uInt16 nColId = GetColumnId(GetColumnAtXPosPixel(rPosPixel.X()));
long nRow = GetRowAtYPosPixel(rPosPixel.Y());
if (nColId != HandleColumnId && nRow >= 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@li
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source sd/source svtools/source svx/source sw/source
dbaccess/source/ui/app/AppView.cxx |4 ++--
reportdesign/source/core/sdr/RptObject.cxx | 16
reportdesign/source/ui/report/ReportSection.cxx |4 ++--
sd/source/filter/eppt/pptx-text.cxx |4 ++--
sd/source/ui/view/sdview3.cxx |8
svtools/source/brwbox/brwbox2.cxx |2 +-
svx/source/svdraw/svddrgmt.cxx |2 +-
sw/source/core/draw/dflyobj.cxx |2 +-
sw/source/uibase/uiview/viewport.cxx|2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 361c6eb18c9ba4043652ba91036094379aeaf05f
Author: Stephan Bergmann
Date: Tue Nov 29 10:22:33 2016 +0100
Use Size::Width/Height instead of inherited Pair::A/B
Change-Id: Ie0346d5ec054fbe7eff1d4b73814a5e2b9f654c2
diff --git a/dbaccess/source/ui/app/AppView.cxx
b/dbaccess/source/ui/app/AppView.cxx
index fdb2f07..c4b1a92 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -245,9 +245,9 @@ void OApplicationView::resizeDocumentView(Rectangle&
_rPlayground)
if ( m_pWin && !_rPlayground.IsEmpty() )
{
Size aFLSize = LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont );
-_rPlayground.Move( aFLSize.A(),aFLSize.B() );
+_rPlayground.Move( aFLSize.Width(),aFLSize.Height() );
Size aOldSize = _rPlayground.GetSize();
-_rPlayground.SetSize( Size(aOldSize.A() - 2*aFLSize.A(), aOldSize.B()
- 2*aFLSize.B()) );
+_rPlayground.SetSize( Size(aOldSize.Width() - 2*aFLSize.Width(),
aOldSize.Height() - 2*aFLSize.Height()) );
m_pWin->SetPosSizePixel(_rPlayground.TopLeft() ,
_rPlayground.GetSize() );
}
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 32a7b77..fda99ce 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -505,8 +505,8 @@ void OCustomShape::NbcMove( const Size& rSize )
{
OReportModel* pRptModel = static_cast(GetModel());
OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv());
-
m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() +
rSize.A());
-
m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() +
rSize.B());
+
m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() +
rSize.Width());
+
m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() +
rSize.Height());
}
// set geometry properties
@@ -677,12 +677,12 @@ void OUnoObject::NbcMove( const Size& rSize )
OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv());
// LLA: why there exists getPositionX and getPositionY and NOT
getPosition() which return a Point?
-int nNewX = m_xReportComponent->getPositionX() + rSize.A();
+int nNewX = m_xReportComponent->getPositionX() + rSize.Width();
m_xReportComponent->setPositionX(nNewX);
-int nNewY = m_xReportComponent->getPositionY() + rSize.B();
+int nNewY = m_xReportComponent->getPositionY() + rSize.Height();
if (nNewY < 0 && !bUndoMode)
{
-aUndoSize.B() = abs(nNewY);
+aUndoSize.Height() = abs(nNewY);
bPositionFixed = true;
nNewY = 0;
}
@@ -957,17 +957,17 @@ void OOle2Obj::NbcMove( const Size& rSize )
OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv());
// LLA: why there exists getPositionX and getPositionY and NOT
getPosition() which return a Point?
-int nNewX = m_xReportComponent->getPositionX() + rSize.A();
+int nNewX = m_xReportComponent->getPositionX() + rSize.Width();
// can this hinder us to set components outside the area?
// if (nNewX < 0)
// {
// nNewX = 0;
// }
m_xReportComponent->setPositionX(nNewX);
-int nNewY = m_xReportComponent->getPositionY() + rSize.B();
+int nNewY = m_xReportComponent->getPositionY() + rSize.Height();
if (nNewY < 0 && !bUndoMode)
{
-aUndoSize.B() = abs(nNewY);
+aUndoSize.Height() = abs(nNewY);
bPositionFixed = true;
nNewY = 0;
}
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index bf86873..b93988e 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -202,8 +202,8 @@ void OReportSection::fill()
m_pView->SetGridFine(aGridSizeFine);
// #i93595# set snap grid width to snap to all existing subdivisions
-const Fraction aX(aGridSizeFine.A());
-const Fraction aY(aG
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source
dbaccess/source/filter/xml/xmlExport.cxx | 10 +-
reportdesign/source/filter/xml/xmlExport.cxx | 12 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 8b499cea76577b4221fccb17703aa9e86b625e90
Author: Noel Grandin
Date: Wed Jul 2 16:01:06 2014 +0200
fix spelling in class name OSpecialHanldeXMLExportPropertyMapper
Change-Id: Ideaa021f76f1c384150caad5ec6a41bf65bae28e
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index d173fa2..da522f6 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -170,10 +170,10 @@ namespace dbaxml
}
}
-class OSpecialHanldeXMLExportPropertyMapper : public
SvXMLExportPropertyMapper
+class OSpecialHandleXMLExportPropertyMapper : public
SvXMLExportPropertyMapper
{
public:
-OSpecialHanldeXMLExportPropertyMapper(const rtl::Reference<
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
+OSpecialHandleXMLExportPropertyMapper(const rtl::Reference<
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
{
}
/** this method is called for every item that has the
@@ -225,10 +225,10 @@ ODBExport::ODBExport(const Reference< XComponentContext
>& _rxContext,sal_uInt16
_GetNamespaceMap().Add( GetXMLToken(XML_NP_NUMBER),
GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER );
m_xExportHelper = new
SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper());
-m_xColumnExportHelper = new
OSpecialHanldeXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
+m_xColumnExportHelper = new
OSpecialHandleXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
-m_xCellExportHelper = new
OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
-m_xRowExportHelper = new
OSpecialHanldeXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper(
true));
+m_xCellExportHelper = new
OSpecialHandleXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
+m_xRowExportHelper = new
OSpecialHandleXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper(
true));
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_TABLE_TABLE,
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 1ce52a1..ffcf047 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -161,10 +161,10 @@ namespace rptxml
-class OSpecialHanldeXMLExportPropertyMapper : public
SvXMLExportPropertyMapper
+class OSpecialHandleXMLExportPropertyMapper : public
SvXMLExportPropertyMapper
{
public:
-OSpecialHanldeXMLExportPropertyMapper(const rtl::Reference<
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
+OSpecialHandleXMLExportPropertyMapper(const rtl::Reference<
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
{
}
/** this method is called for every item that has the
@@ -275,17 +275,17 @@ ORptExport::ORptExport(const Reference< XComponentContext
>& _rxContext, OUStrin
m_xTableStylesExportPropertySetMapper = new
SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1);
m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap(
false, true);
-m_xCellStylesExportPropertySetMapper = new
OSpecialHanldeXMLExportPropertyMapper(m_xCellStylesPropertySetMapper);
+m_xCellStylesExportPropertySetMapper = new
OSpecialHandleXMLExportPropertyMapper(m_xCellStylesPropertySetMapper);
m_xCellStylesExportPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
rtl::Reference < XMLPropertySetMapper > xColumnStylesPropertySetMapper =
new XMLPropertySetMapper(OXMLHelper::GetColumnStyleProps(), m_xPropHdlFactory,
true);
-m_xColumnStylesExportPropertySetMapper = new
OSpecialHanldeXMLExportPropertyMapper(xColumnStylesPropertySetMapper);
+m_xColumnStylesExportPropertySetMapper = new
OSpecialHandleXMLExportPropertyMapper(xColumnStylesPropertySetMapper);
rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper = new
XMLPropertySetMapper(OXMLHelper::GetRowStyleProps(), m_xPropHdlFactory, true);
-m_xRowStylesExportPropertySetMapper = new
OSpecialHanldeXMLExportPropertyMapper(xRowStylesPropertySetMapper);
+m_xRowStylesExportPropertySetMapper = new
OSpecialHandleXMLExportPropertyMapper(xRowStylesPropertySetMapper);
rtl::Reference < XMLPropertySetMapper > xPropMapper(new
XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true ));
-m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper(
xPropMapper);
+m_xParaPropMapper = new OSpecialHandleXMLExportPropertyMapper(
xPropMapper);
OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
OUString aPrefix
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source xmloff/source
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx |1 +
reportdesign/source/filter/xml/xmlControlProperty.cxx |1 +
xmloff/source/forms/propertyimport.cxx|5 +
3 files changed, 7 insertions(+)
New commits:
commit f62de9113a4866f7152acbe0e8221c594b7a7b68
Author: Julien Nabet
Date: Sat May 17 09:36:18 2014 +0200
Comment why it's not a copy paste error
See
http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-td4109071.html
Thank you Lionel!
Change-Id: I999bad0d6de0327bea7ba04a6c61a497d45f53a0
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 5618378..6c6bacf 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -74,6 +74,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter&
rImport
if (s_aTypeNameMap.empty())
{
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] =
::getBooleanCppuType();
+// Not a copy paste error, see comment
xmloff/source/forms/propertyimport.cxx lines 244-248
s_aTypeNameMap[GetXMLToken( XML_FLOAT)] =
::cppu::UnoType::get();
s_aTypeNameMap[GetXMLToken( XML_DOUBLE)]=
::cppu::UnoType::get();
s_aTypeNameMap[GetXMLToken( XML_STRING)]=
::cppu::UnoType::get();
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 5545bb2..942cf3f 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -85,6 +85,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
if (s_aTypeNameMap.empty())
{
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] =
::getBooleanCppuType();
+// Not a copy paste error, see comment
xmloff/source/forms/propertyimport.cxx lines 244-248
s_aTypeNameMap[GetXMLToken( XML_FLOAT)] =
cppu::UnoType::get();
s_aTypeNameMap[GetXMLToken( XML_DOUBLE)]=
cppu::UnoType::get();
s_aTypeNameMap[GetXMLToken( XML_STRING)]=
cppu::UnoType::get();
diff --git a/xmloff/source/forms/propertyimport.cxx
b/xmloff/source/forms/propertyimport.cxx
index 1b47bf3..c992b6f 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -241,6 +241,11 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString&
_rType )
if ( s_aTypeNameMap.empty() )
{
s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] =
::getBooleanCppuType();
+// Not a copy paste error, quotation from:
+//
http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-tp4109071p4109116.html
+// all numeric types (including the UNO double)
+// consistently map to XML_FLOAT, so taking the extra precision from
the
+// C++ type "float" to "double" makes absolute sense
s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] =
::cppu::UnoType::get();
s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] =
::cppu::UnoType::get();
s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID )] =
::getVoidCppuType();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source sd/source svx/source sw/qa sw/source xmloff/source
dbaccess/source/filter/xml/xmlfilter.cxx |5 --
dbaccess/source/ui/browser/genericcontroller.cxx |8
reportdesign/source/filter/xml/xmlfilter.cxx |6 ---
sd/source/filter/xml/sdxmlwrp.cxx| 12 --
svx/source/svdraw/svdmodel.cxx | 24
sw/qa/core/Test-BigPtrArray.cxx | 45 ---
sw/source/filter/xml/swxml.cxx |7 ---
xmloff/source/core/xmlexp.cxx| 14 ---
xmloff/source/core/xmlimp.cxx|9
9 files changed, 130 deletions(-)
New commits:
commit 107c2c7c7bb7eacba4045159ac40fe3b6737d4f3
Author: Stephan Bergmann
Date: Wed Nov 6 20:54:44 2013 +0100
Remove #ifdef TIMELOG'ed SAL_INFOs
...the code doesn't make much sense that way.
Change-Id: I506e37b44924701255431f6d20d4610f7f52287d
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 8ead508..b94e0ce 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -331,11 +331,6 @@ sal_Int32 ReadThroughComponent(
return 1; // TODO/LATER: error handling
}
-#ifdef TIMELOG
-// if we do profiling, we want to know the stream
- SAL_INFO("dbaccess", "dbaxml ReadThroughComponent : parsing \"" <<
pStreamName << "\"" );
-#endif
-
uno::Reference< XInputStream > xInputStream =
xDocStream->getInputStream();
// read from the stream
return ReadThroughComponent( xInputStream
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5ea4421..064670c 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -728,14 +728,6 @@ void OGenericUnoController::dispatch(const URL& _aURL,
const Sequence< PropertyV
// for locking in the proper order (SolarMutex and m_aMutex), and b) this
would be too many places
// for the time frame of the fix.
// #i52602#
-
-#ifdef TIMELOG
-OString sLog( "OGenericUnoController::dispatch( '" );
-sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(),
osl_getThreadTextEncoding() );
-sLog += OString( "' )" );
-SAL_INFO("dbaccess.ui", "dbaccess frank.schoenh...@sun.com" <<
sLog.getStr() );
-#endif
-
executeChecked(_aURL,aArgs);
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index a7109c2..1cdc9c4 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -152,12 +152,6 @@ sal_Int32 ReadThroughComponent(
uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY );
xImporter->setTargetDocument( xModelComponent );
-
-#ifdef TIMELOG
-// if we do profiling, we want to know the stream
-SAL_INFO( "reportdesign", "rptxml ReadThroughComponent : parsing \"" <<
pStreamName << "\"" );
-#endif
-
// finally, parser the stream
try
{
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index 50aba6f..9c102da 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -432,12 +432,6 @@ sal_Int32 ReadThroughComponent(
sal_Bool SdXMLFilter::Import( ErrCode& nError )
{
-SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Import" );
-#ifdef TIMELOG
-OString aFile(OUStringToOString(mrMedium.GetName(),
RTL_TEXTENCODING_ASCII_US));
-SAL_INFO( "sd.filter", "importing " << aFile.getStr() );
-#endif
-
sal_uInt32 nRet = 0;
// Get service factory
@@ -809,12 +803,6 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
sal_Bool SdXMLFilter::Export()
{
-#ifdef TIMELOG
-SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Export" );
-OString aFile(OUStringToOString(mrMedium.GetName(),
RTL_TEXTENCODING_ASCII_US));
-SAL_INFO( "sd.filter", "exporting " << aFile.getStr() );
-#endif
-
SvXMLEmbeddedObjectHelper* pObjectHelper = NULL;
SvXMLGraphicHelper* pGraphicHelper = NULL;
sal_BoolbDocRet = sal_False;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 1693d49..f0ab176 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -218,10 +218,6 @@ SdrModel::SdrModel(SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* pPers, sal
maMaPag(),
maPages()
{
-#ifdef TIMELOG
-SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
}
@@ -232,10 +228,6 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool*
pPool, ::comphelper::IEmb
maPages(),
aTablePath(rPath)
{
-#ifdef TIMELOG
-SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, fals
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx |2 +-
reportdesign/source/filter/xml/xmlControlProperty.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e13bd0cfc7cd395baa125fff86171d030be71f8c
Author: Julien Nabet
Date: Sun May 12 11:57:18 2013 +0200
Fix possible inefficient checking for variables emptiness
Change-Id: I95a6784d5448b63b0cdde436484915692f8633be
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index b9c779a..0316905 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -73,7 +73,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter&
rImport
{
// needs to be translated into a
::com::sun::star::uno::Type
static std::map< OUString, css::uno::Type > s_aTypeNameMap;
-if (!s_aTypeNameMap.size())
+if (s_aTypeNameMap.empty())
{
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] =
::getBooleanCppuType();
s_aTypeNameMap[GetXMLToken( XML_FLOAT)] =
::getCppuType( static_cast< double* >(NULL) );
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 7d4ec15..6509da4 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -86,7 +86,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
{
// needs to be translated into a
::com::sun::star::uno::Type
static std::map< OUString, css::uno::Type > s_aTypeNameMap;
-if (!s_aTypeNameMap.size())
+if (s_aTypeNameMap.empty())
{
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] =
::getBooleanCppuType();
s_aTypeNameMap[GetXMLToken( XML_FLOAT)] =
::getCppuType( static_cast< double* >(NULL) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
