chart2/source/model/filter/XMLFilter.cxx | 20 ++++++++++----------
chart2/source/model/main/ChartModel.cxx | 2 +-
chart2/source/tools/ErrorBar.cxx | 8 ++++----
svx/source/unogallery/unogalitem.cxx | 4 ++--
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 8a725a02b58e525e05e4d93363f1c5c5d5a42003
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun May 11 10:51:34 2014 +0200
Fix previous commit (svx part)
Change-Id: I58fb2aca452935c04c498ee63c3b4060b1ebc50e
diff --git a/svx/source/unogallery/unogalitem.cxx
b/svx/source/unogallery/unogalitem.cxx
index b761d8c..284a734 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -226,10 +226,10 @@ sal_Int8 SAL_CALL GalleryItem::getType()
{ OUString("GalleryItemType"), UNOGALLERY_GALLERYITEMTYPE,
::getCppuType( (const sal_Int8*)(0)),
beans::PropertyAttribute::READONLY, 0 },
- { OUString("URL"), UNOGALLERY_URL,
::cppu::UnoType<OUString>::get()(0)),
+ { OUString("URL"), UNOGALLERY_URL, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::READONLY, 0 },
- { OUString("Title"), UNOGALLERY_TITLE,
::cppu::UnoType<OUString>::get()(0)),
+ { OUString("Title"), UNOGALLERY_TITLE,
::cppu::UnoType<OUString>::get(),
0, 0 },
{ OUString("Thumbnail"), UNOGALLERY_THUMBNAIL, ::getCppuType( (const
uno::Reference< graphic::XGraphic >*)(0)),
commit a1e41fc3d18816b25f7d26bf05eb548ec22309aa
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun May 11 10:44:13 2014 +0200
Fix previous commit (chart2 part)
Change-Id: I9d6491f484eb2a8989b7e3594ca2edf702557b12
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 5bbfa39..32f0419 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -335,23 +335,23 @@ sal_Int32 XMLFilter::impl_Import(
comphelper::PropertyMapEntry const aImportInfoMap[] =
{
// necessary properties for XML progress bar at load time
- { OUString("ProgressRange"), 0,
::cppu::UnoType<sal_Int32>::get()0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("ProgressMax"), 0,
::cppu::UnoType<sal_Int32>::get()0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("ProgressCurrent"), 0,
::cppu::UnoType<sal_Int32>::get()0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressRange"), 0,
::cppu::UnoType<sal_Int32>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressMax"), 0,
::cppu::UnoType<sal_Int32>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressCurrent"), 0,
::cppu::UnoType<sal_Int32>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
::getCppuType( (Reference<XInterface> *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
- ::cppu::UnoType<OUString>::get()0 ),
+ ::cppu::UnoType<OUString>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamRelPath"), 0,
- ::cppu::UnoType<OUString>::get()0 ),
+ ::cppu::UnoType<OUString>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamName"), 0,
- ::cppu::UnoType<OUString>::get()0 ),
+ ::cppu::UnoType<OUString>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BuildId"), 0,
- ::cppu::UnoType<OUString>::get()0 ),
+ ::cppu::UnoType<OUString>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -609,9 +609,9 @@ sal_Int32 XMLFilter::impl_Export(
comphelper::PropertyMapEntry const aExportInfoMap[] =
{
{ OUString("UsePrettyPrinting"), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get()0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
- { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get()0
), beans::PropertyAttribute::MAYBEVOID, 0 },
- { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get()0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("ExportTableNumberList"), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index fd5689d..34e8f47 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -103,7 +103,7 @@
ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
, m_xDataProvider( 0 )
, m_xInternalDataProvider( 0 )
, m_xPageBackground( new PageBackground( m_xContext ) )
- , m_xXMLNamespaceMap( createNameContainer(
::cppu::UnoType<OUString>::get() 0 ),
+ , m_xXMLNamespaceMap( createNameContainer(
::cppu::UnoType<OUString>::get(),
"com.sun.star.xml.NamespaceMap",
"com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY)
, mnStart(0)
, mnEnd(0)
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index eca75fc..4bf5338 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -60,13 +60,13 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
{OUString("PositiveError"),2,getCppuType((const double*)0),0,0},
{OUString("NegativeError"),3,getCppuType((const double*)0), 0, 0},
{OUString("PercentageError"),4,getCppuType((const double*)0), 0, 0},
- {OUString("ErrorBarStyle"),5,cppu::UnoType<sal_Int32>::get()0),0,0},
-
{OUString("ErrorBarRangePositive"),6,cppu::UnoType<OUString>::get()0),0,0}, //
read-only for export
-
{OUString("ErrorBarRangeNegative"),7,cppu::UnoType<OUString>::get()0),0,0}, //
read-only for export
+ {OUString("ErrorBarStyle"),5,cppu::UnoType<sal_Int32>::get(),0,0},
+
{OUString("ErrorBarRangePositive"),6,cppu::UnoType<OUString>::get(),0,0}, //
read-only for export
+
{OUString("ErrorBarRangeNegative"),7,cppu::UnoType<OUString>::get(),0,0}, //
read-only for export
{OUString("Weight"),8,getCppuType((const double*)0),0,0},
{OUString("LineStyle"),9,getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
{OUString("LineDash"),10,getCppuType((drawing::LineDash*)0),0,0},
- {OUString("LineWidth"),11,cppu::UnoType<sal_Int32>::get()0),0,0},
+ {OUString("LineWidth"),11,cppu::UnoType<sal_Int32>::get(),0,0},
{OUString("LineColor"),12,getCppuType((com::sun::star::util::Color*)0),0,0},
{OUString("LineTransparence"),13,getCppuType((sal_Int16*)0),0,0},
{OUString("LineJoint"),14,getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
