accessibility/source/helper/acc_factory.cxx | 4 ++--
include/toolkit/helper/accessiblefactory.hxx | 2 +-
oox/source/export/drawingml.cxx | 5 ++---
sd/qa/unit/sdmodeltestbase.hxx | 2 +-
toolkit/source/awt/vclxwindows.cxx | 2 +-
toolkit/source/helper/accessibilityclient.cxx | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 422f873ba8ec3ad7d4a6dd054cbde4d9d7d3a5cb
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Sep 12 10:02:22 2014 +0200
Partial revert of e910705421b40f3accff684e956854ff68761574
"Use Any.get<T>(..) instead of Any.getValue(..) and ugly cast." An empty
OString means a different thing than a char* nullptr to
FastSerializerHelper::startElementNS. Broke CppunitTest_sd_export_tests at
least --with-export-validation.
Change-Id: I4ad23c4130bf39708064569b964bcb7fb44cd3b0
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 36869e6..8436c9b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -632,11 +632,10 @@ void DrawingML::WriteOutline( Reference<XPropertySet>
rXPropSet )
break;
}
- OString sWidth = (nLineWidth > 1 && nStyleLineWidth != nLineWidth) ?
I64S(MM100toEMU(nLineWidth)) : NULL;
-
mpFS->startElementNS( XML_a, XML_ln,
XML_cap, cap,
- XML_w, sWidth,
+ XML_w, nLineWidth > 1 && nStyleLineWidth !=
nLineWidth ?
+ I64S( MM100toEMU( nLineWidth ) ) :NULL,
FSEND );
if( bColorSet )
commit e4d500221f90d8c75e38107896c8b86ec5a3f683
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Sep 12 10:01:35 2014 +0200
Keep files of failing tests around
(Arguably, such files should be stored in a workdir/CppunitTest/...
directory
removed and freshly created before every test run, instead of in TMPDIR.)
Change-Id: I12e5073f4e8098cfd99456101fbc2d6ab919f093
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index a5d1133..e07e46f 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -175,7 +175,6 @@ protected:
{
FileFormat* pFormat = getFormat(nExportType);
utl::TempFile aTempFile;
- aTempFile.EnableKillingFile();
save(pShell, pFormat, aTempFile);
if(nExportType == ODP)
{
@@ -185,6 +184,7 @@ protected:
{
BootstrapFixture::validate(aTempFile.GetFileName(), test::OOXML);
}
+ aTempFile.EnableKillingFile();
return loadURL(aTempFile.GetURL(), nExportType);
}
commit 69ac0fa53b60bc2ab65a2590f3eb3f789bcfc31c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Sep 11 17:17:33 2014 +0200
toolkit: sal_Bool -> bool
Change-Id: I8819d408e8556bbf38605c2feef2fa87d8dd41c3
diff --git a/accessibility/source/helper/acc_factory.cxx
b/accessibility/source/helper/acc_factory.cxx
index 495d93d..5b9bdca 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -114,7 +114,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleContext >
createAccessibleContext( VCLXWindow* _pXWindow ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >
- createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar ) SAL_OVERRIDE;
+ createAccessible( Menu* _pMenu, bool _bIsMenuBar ) SAL_OVERRIDE;
// ::svt::IAccessibleFactory
virtual IAccessibleTabListBox*
@@ -228,7 +228,7 @@ AccessibleFactory::~AccessibleFactory()
{
}
-Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu,
sal_Bool _bIsMenuBar )
+Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu,
bool _bIsMenuBar )
{
OAccessibleMenuBaseComponent* pAccessible;
if ( _bIsMenuBar )
diff --git a/include/toolkit/helper/accessiblefactory.hxx
b/include/toolkit/helper/accessiblefactory.hxx
index e56eda2..fc99828 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -119,7 +119,7 @@ namespace toolkit
/** creates an accessible component for the given menu
*/
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >
- createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar ) = 0;
+ createAccessible( Menu* _pMenu, bool _bIsMenuBar ) = 0;
protected:
virtual ~IAccessibleFactory() {}
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 71d4f03..01fbbe0 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4370,7 +4370,7 @@ void VCLXComboBox::setProperty( const OUString&
PropertyName, const ::com::sun::
pComboBox->EnableAutocomplete( n != 0 );
else
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
pComboBox->EnableAutocomplete( b );
}
diff --git a/toolkit/source/helper/accessibilityclient.cxx
b/toolkit/source/helper/accessibilityclient.cxx
index 7dc3794..1ddf9b3 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -116,7 +116,7 @@ namespace toolkit
return NULL;
}
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >
- createAccessible( Menu* /*_pMenu*/, sal_Bool /*_bIsMenuBar*/ )
SAL_OVERRIDE
+ createAccessible( Menu* /*_pMenu*/, bool /*_bIsMenuBar*/ )
SAL_OVERRIDE
{
return NULL;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
