[Libreoffice-commits] core.git: canvas/workben
canvas/workben/canvasdemo.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 46617d95f409c743ef9d60d2f6309200c44cd79f
Author: Stephan Bergmann
AuthorDate: Mon Nov 20 07:31:17 2023 +0100
Commit: Stephan Bergmann
CommitDate: Mon Nov 20 10:00:14 2023 +0100
Extended loplugin:ostr: canvas
Change-Id: I7c5ee1eb15a4464c9dfc2e292df3e6adf71d3956
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159726
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index eb9356a04926..792fc49c7943 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -271,7 +271,7 @@ class DemoRenderer
{
rendering::RenderState maOldRenderState = maRenderState; // push
-drawTitle( OString( "Rectangles" ) );
+drawTitle( "Rectangles"_ostr );
drawRect( tools::Rectangle( 20, 30, 70, 60 ), maColorRed, 8 );
// color mediumseagreen, stipple fill, outline black
@@ -287,7 +287,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width(), 0.0 );
-drawTitle( OString( "Ellipses" ) );
+drawTitle( "Ellipses"_ostr );
const basegfx::B2DPoint aCenter( maBox.Width()*.5,
maBox.Height()*.5 );
@@ -318,11 +318,11 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, 0.0 );
-drawTitle( OString( "Text" ) );
+drawTitle( "Text"_ostr );
translate( 0.0,
maBox.Height() * .5 );
-drawTitle( OString( "This is lame" ) );
+drawTitle( "This is lame"_ostr );
maRenderState = maOldRenderState; // pop
}
@@ -332,7 +332,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( 0.0, maBox.Height() );
-drawTitle( OString( "Images" ) );
+drawTitle( "Images"_ostr );
uno::Reference< rendering::XBitmap > xBitmap(mxCanvas,
uno::UNO_QUERY);
@@ -365,7 +365,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width(), maBox.Height() );
-drawTitle( OString( "Lines" ) );
+drawTitle( "Lines"_ostr );
drawPolishDiamond( 70.0, 80.0 );
drawHilbert( 140.0, 140.0 );
@@ -378,7 +378,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, maBox.Height() );
-drawTitle( OString( "Curves" ) );
+drawTitle( "Curves"_ostr );
translate( maBox.Width() * .5, maBox.Height() * .5 );
@@ -426,7 +426,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( 0.0, maBox.Height() * 2.0 );
-drawTitle( OString( "Arcs" ) );
+drawTitle( "Arcs"_ostr );
//begin hacks
@@ -504,7 +504,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 1.0, maBox.Height() * 2.0 );
-drawTitle( OString( "Polygons" ) );
+drawTitle( "Polygons"_ostr );
int sides= 3;
for (int i= 1; i <= 4; i++)
@@ -521,7 +521,7 @@ class DemoRenderer
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, maBox.Height() * 2.0 );
-drawTitle( OString( "Widgets" ) );
+drawTitle( "Widgets"_ostr );
maRenderState = maOldRenderState; // pop
}
[Libreoffice-commits] core.git: canvas/workben
canvas/workben/canvasdemo.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6538e5b0bb01fd07183cc6ab99b493cf2b87c3d9 Author: Andrea Gelmini AuthorDate: Mon Aug 17 17:54:38 2020 +0200 Commit: Stephan Bergmann CommitDate: Wed Aug 19 08:13:40 2020 +0200 Fix typo in code Change-Id: Ied22aa3812e7db3550e8884720b1df32e38c65be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100870 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index a1c5b58165fc..233f0ff3e7d8 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -510,7 +510,7 @@ class DemoRenderer rendering::RenderState maOldRenderState = maRenderState; // push translate( maBox.Width() * 1.0, maBox.Height() * 2.0 ); -drawTitle( OString( "Polgyons" ) ); +drawTitle( OString( "Polygons" ) ); int sides= 3; for (int i= 1; i <= 4; i++) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/workben desktop/source include/osl include/vcl vcl/source
canvas/workben/canvasdemo.cxx | 10 -
desktop/source/app/app.cxx | 42 +
include/osl/signal.h |1
include/vcl/exceptiontypes.hxx |2 -
vcl/source/app/svapp.cxx | 10 -
vcl/source/app/svmain.cxx |5
6 files changed, 16 insertions(+), 54 deletions(-)
New commits:
commit 9951d41460aa0b7fe24375a9e1eced87106c29b3
Author: Noel Grandin
AuthorDate: Sun Aug 16 09:42:27 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Aug 17 12:08:07 2020 +0200
[API CHANGE] remove OSL_SIGNAL_USER_RESOURCEFAILURE
which is unused since
commit 00657aef09d854c74fb426a935a3e8b1fc390bb0
Date: Sun Jun 11 20:56:30 2017 +0100
migrate to boost::gettext
Change-Id: Ia66a3a729dc4999c95b96ae1754b07c372121370
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100810
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 603ec295ba0d..a1c5b58165fc 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -636,16 +636,8 @@ int DemoApp::Main()
return 0;
}
-void DemoApp::Exception( ExceptionCategory nCategory )
+void DemoApp::Exception( ExceptionCategory )
{
-switch( nCategory )
-{
-case ExceptionCategory::ResourceNotLoaded:
-Abort( "Error: could not load language resources.\nPlease check
your installation.\n" );
-break;
-default:
-break;
-}
}
void DemoApp::Init()
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c3baa5392817..8c020c486798 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1147,37 +1147,23 @@ void Desktop::Exception(ExceptionCategory nCategory)
FlushConfiguration();
-switch( nCategory )
-{
-case ExceptionCategory::ResourceNotLoaded:
-{
-Application::Abort( "OS threw signal
OSL_SIGNAL_USER_RESOURCEFAILURE" );
-break;
-}
-
-default:
-{
-m_xLockfile.reset();
+m_xLockfile.reset();
-if( bRestart )
-{
-RequestHandler::Disable();
-if( pSignalHandler )
-osl_removeSignalHandler( pSignalHandler );
-
-restartOnMac(false);
-if ( m_rSplashScreen.is() )
-m_rSplashScreen->reset();
+if( bRestart )
+{
+RequestHandler::Disable();
+if( pSignalHandler )
+osl_removeSignalHandler( pSignalHandler );
-_exit( EXITHELPER_CRASH_WITH_RESTART );
-}
-else
-{
-Application::Abort( OUString() );
-}
+restartOnMac(false);
+if ( m_rSplashScreen.is() )
+m_rSplashScreen->reset();
-break;
-}
+_exit( EXITHELPER_CRASH_WITH_RESTART );
+}
+else
+{
+Application::Abort( OUString() );
}
OSL_ASSERT(false); // unreachable
diff --git a/include/osl/signal.h b/include/osl/signal.h
index 4b7beadc295a..a467452bec10 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -31,7 +31,6 @@ extern "C" {
#define OSL_SIGNAL_USER_RESERVED0
-#define OSL_SIGNAL_USER_RESOURCEFAILURE (OSL_SIGNAL_USER_RESERVED - 1)
#define OSL_SIGNAL_USER_X11SUBSYSTEMERROR (OSL_SIGNAL_USER_RESERVED - 2)
typedef void* oslSignalHandler;
diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx
index bde3f5f5f91d..83654d3705bb 100644
--- a/include/vcl/exceptiontypes.hxx
+++ b/include/vcl/exceptiontypes.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_EXCEPTIONTYPES_HXX
enum class ExceptionCategory {
-NONE, ResourceNotLoaded, System, UserInterface
+NONE, System, UserInterface
};
#endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 80b92f34de5d..04f6f1670143 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -244,19 +244,9 @@ void Application::Exception( ExceptionCategory nCategory )
case ExceptionCategory::System:
case ExceptionCategory::UserInterface:
break;
-
-#ifdef DBG_UTIL
-case ExceptionCategory::ResourceNotLoaded:
-Abort("Resource not loaded");
-break;
default:
Abort("Unknown Error");
break;
-#else
-default:
-Abort(OUString());
-break;
-#endif
}
}
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 05d8ef9c34a6..2093f66a5ad7 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -145,11 +145,6 @@ static oslSignalAction VCLExceptionSignal_impl( void*
/*pData*/, oslSignalInfo*
#endif
}
-// RC
-if ((pInfo->Signal == osl_Signal_User) &&
-(pInfo->UserSignal =
[Libreoffice-commits] core.git: canvas/workben
canvas/workben/canvasdemo.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit c32dedb3a6b44c6f9e5badb656883792adbcb0a2 Author: Stephan Bergmann AuthorDate: Tue Nov 26 19:40:37 2019 +0100 Commit: Stephan Bergmann CommitDate: Tue Nov 26 22:16:32 2019 +0100 Remove unused DemoRenderer::maColorWhite (found by upcoming loplugin:unusedmember) Change-Id: I518c70d3f4011bd5f0f582ca239dc6f8e49d9656 Reviewed-on: https://gerrit.libreoffice.org/83813 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 00acbe9a5d82..603ec295ba0d 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -82,7 +82,6 @@ class DemoRenderer rendering::ViewState maViewState; rendering::RenderState maRenderState; uno::Sequence< double > maColorBlack; -uno::Sequence< double > maColorWhite; uno::Sequence< double > maColorRed; uno::Reference< rendering::XCanvas > mxCanvas; uno::Reference< rendering::XCanvasFont > mxDefaultFont; @@ -96,7 +95,6 @@ class DemoRenderer maViewState(), maRenderState(), maColorBlack( vcl::unotools::colorToStdColorSpaceSequence( COL_BLACK) ), -maColorWhite( vcl::unotools::colorToStdColorSpaceSequence( COL_WHITE) ), maColorRed( vcl::unotools::colorToStdColorSpaceSequence( COL_RED) ), mxCanvas(xCanvas), mxDefaultFont(), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/workben include/vcl solenv/clang-format toolkit/inc vcl/inc vcl/source
canvas/workben/canvasdemo.cxx |1 - solenv/clang-format/blacklist |2 +- toolkit/inc/helper/unowrapper.hxx |2 +- vcl/inc/pch/precompiled_vcl.hxx |2 +- vcl/source/app/salvtables.cxx |2 +- vcl/source/app/svapp.cxx|2 +- vcl/source/app/svmain.cxx |2 +- vcl/source/outdev/outdev.cxx|2 +- vcl/source/window/accessibility.cxx |2 +- vcl/source/window/dialog.cxx|2 +- vcl/source/window/dockmgr.cxx |2 +- vcl/source/window/dockwin.cxx |2 +- vcl/source/window/menu.cxx |2 +- vcl/source/window/syswin.cxx|2 +- vcl/source/window/window.cxx|2 +- 15 files changed, 14 insertions(+), 15 deletions(-) New commits: commit d377c085627ac00268952d2401a8b8fde360336c Author: Caolán McNamara AuthorDate: Sun Oct 14 19:49:00 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 14 22:16:56 2018 +0200 unowrap.hxx is also exposed for toolkit only Change-Id: Ife3648c8ca84c942f02fb6eab2990ec3eb3eb3f9 Reviewed-on: https://gerrit.libreoffice.org/61764 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index c419bb72775a..20b345e5060a 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/include/vcl/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx similarity index 100% rename from include/vcl/unowrap.hxx rename to include/vcl/toolkit/unowrap.hxx diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 5f15395d1dca..6d0368fc6783 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -8052,6 +8052,7 @@ include/vcl/throbber.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx include/vcl/toolkit/group.hxx +include/vcl/toolkit/unowrap.hxx include/vcl/txtattr.hxx include/vcl/uitest/factory.hxx include/vcl/uitest/logger.hxx @@ -8059,7 +8060,6 @@ include/vcl/uitest/uiobject.hxx include/vcl/uitest/uitest.hxx include/vcl/unohelp.hxx include/vcl/unohelp2.hxx -include/vcl/unowrap.hxx include/vcl/vclenum.hxx include/vcl/vclevent.hxx include/vcl/vcllayout.hxx diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index 31844f12cd35..1c6c2a5e8a67 100644 --- a/toolkit/inc/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 509a0493ffec..c37db5d2bd15 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -179,9 +179,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index aed6316810e9..efb5214ddb33 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 43cdf894e3c2..cd4422f0ef89 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4f660133ebf6..673e800e4ac4 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 340c0a68f495..a58bc91779cc 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 6802b1a604f7..069cac8e11e7 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 5b2ec3b225db..a03ea6021d33 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 795a6f98c0fa..c5d6a93798d4 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEA
[Libreoffice-commits] core.git: canvas/workben desktop/inc desktop/source include/vcl slideshow/test vcl/source vcl/workben
canvas/workben/canvasdemo.cxx |9 ++--
desktop/inc/app.hxx|2 -
desktop/source/app/app.cxx |8 ++--
include/vcl/exceptiontypes.hxx |8 +---
include/vcl/svapp.hxx | 11 +-
slideshow/test/demoshow.cxx|9 ++--
vcl/source/app/svapp.cxx | 10 ++---
vcl/source/app/svmain.cxx | 74 +++--
vcl/workben/outdevgrind.cxx|9 ++--
9 files changed, 65 insertions(+), 75 deletions(-)
New commits:
commit 7d902940508decad933c19bc97e5409873ab5189
Author: Noel Grandin
Date: Wed May 11 16:10:39 2016 +0200
convert EXCEPTION_ to scoped enum
- simplify VCLExceptionSignal_impl
- drop "minor" part of error code, nobody passes it in, and nobody
checks it
- rename Display to UserInterface, to prevent -Werror=shadow
Change-Id: I503fd8a50ded30d59c30fb388796f6b1a0c058de
Reviewed-on: https://gerrit.libreoffice.org/24892
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 4a8143c..af2319a 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -64,7 +64,7 @@ class DemoApp : public Application
{
public:
virtual void Main();
-virtual USHORT Exception( USHORT nError );
+virtual void Exception( ExceptionCategory nCategory );
};
static void PrintHelp()
@@ -621,15 +621,14 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
}
}
-USHORT DemoApp::Exception( USHORT nError )
+void DemoApp::Exception( ExceptionCategory nCategory )
{
-switch( nError & EXCEPTION_MAJORTYPE )
+switch( nCategory )
{
-case EXCEPTION_RESOURCENOTLOADED:
+case ExceptionCategory::ResourceNotLoaded:
Abort( "Error: could not load language resources.\nPlease check
your installation.\n" );
break;
}
-return 0;
}
void DemoApp::Main()
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 3bcc098..1905cf0 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -76,7 +76,7 @@ class Desktop : public Application
virtual voidInitFinished() override;
virtual voidDeInit() override;
virtual boolQueryExit() override;
-virtual voidException(sal_uInt16 nError) override;
+virtual voidException(ExceptionCategory nCategory)
override;
virtual voidOverrideSystemSettings( AllSettings& rSettings
) override;
virtual voidAppEvent( const ApplicationEvent& rAppEvent )
override;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 133c4c5..847381c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1223,7 +1223,7 @@ void restartOnMac(bool passArguments) {
}
-void Desktop::Exception(sal_uInt16 nError)
+void Desktop::Exception(ExceptionCategory nCategory)
{
// protect against recursive calls
static bool bInException = false;
@@ -1244,7 +1244,7 @@ void Desktop::Exception(sal_uInt16 nError)
bool bAllowRecoveryAndSessionManagement = (
( !rArgs.IsNoRestore()
) && // some use cases of office must work without recovery
( !rArgs.IsHeadless()
) &&
-(( nError &
EXCEPTION_MAJORTYPE ) != EXCEPTION_DISPLAY ) && // recovery can't work without
UI ... but UI layer seems to be the reason for this crash
+( nCategory !=
ExceptionCategory::UserInterface ) && // recovery can't work without UI ... but
UI layer seems to be the reason for this crash
(
Application::IsInExecute() )// crashes during startup and
shutdown should be ignored (they indicates a corrupt installation ...)
);
if ( bAllowRecoveryAndSessionManagement )
@@ -1252,9 +1252,9 @@ void Desktop::Exception(sal_uInt16 nError)
FlushConfiguration();
-switch( nError & EXCEPTION_MAJORTYPE )
+switch( nCategory )
{
-case EXCEPTION_RESOURCENOTLOADED:
+case ExceptionCategory::ResourceNotLoaded:
{
OUString aResExceptionString;
Application::Abort( aResExceptionString );
diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx
index bdf044a..bde3f5f 100644
--- a/include/vcl/exceptiontypes.hxx
+++ b/include/vcl/exceptiontypes.hxx
@@ -20,11 +20,9 @@
#ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX
#define INCLUDED_VCL_EXCEPTIONTYPES_HXX
-#define EXCEPTION_RESOURCENOTLOADED ((sal_uInt16)0x0100)
-#define EXCEPTION_SYSTEM ((sal_uInt16)0x0300)
-#define EXCEPTION_DISPLAY((sal_uInt16)0x0400)
-#define EXCEPTION_MAJO
[Libreoffice-commits] core.git: canvas/workben
canvas/workben/canvasdemo.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c6b795140abeb9dab00b3a149c5c8042198ac1d4
Author: Ricardo Montania
Date: Sat Feb 23 10:12:07 2013 -0300
CreateFromAscii removal in canvas
Change-Id: I89cd673aea154e96b26323d4e424b97c0fdda0f7
Reviewed-on: https://gerrit.libreoffice.org/2346
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index dfb57ce..a1e142d 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -629,7 +629,7 @@ USHORT DemoApp::Exception( USHORT nError )
switch( nError & EXC_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
-Abort( String::CreateFromAscii( "Error: could not load language
resources.\nPlease check your installation.\n" ) );
+Abort( "Error: could not load language resources.\nPlease check
your installation.\n" );
break;
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
