From b1c25a0d8fa2f8effc501cc100b0c07f79437e8e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 27 Jul 2015 13:04:00 +0200 Subject: inline "old" SbERR constants Change-Id: I3e6665351de97692ae70207e8b623ad008ca8c9a --- sd/source/ui/view/ViewShellImplementation.cxx | 4 +-- sd/source/ui/view/drviews2.cxx | 12 ++++----- sd/source/ui/view/drviews3.cxx | 6 ++--- sd/source/ui/view/drviews9.cxx | 36 +++++++++++++-------------- sd/source/ui/view/viewshe3.cxx | 4 +-- 5 files changed, 31 insertions(+), 31 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 73ea44f8e388..40a668990e43 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -144,7 +144,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( else { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif rRequest.Ignore (); break; @@ -158,7 +158,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( else { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rRequest.Ignore (); break; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9999d012a361..68e4914a0a40 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -485,7 +485,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rReq.Ignore (); break; @@ -513,7 +513,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rReq.Ignore (); break; @@ -562,13 +562,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); } #if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif rReq.Ignore (); break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rReq.Ignore (); break; @@ -1443,7 +1443,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else if (pArgs->Count () != 4) { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif Cancel(); rReq.Ignore (); @@ -1625,7 +1625,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif Cancel (); rReq.Ignore (); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 22ca54640576..f95eacae4b19 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -154,7 +154,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (! CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT)) { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif rReq.Ignore (); break; @@ -164,7 +164,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (! CHECK_RANGE (0, nWhatPage, GetDoc()->GetSdPageCount((PageKind)nWhatKind))) { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif rReq.Ignore (); break; @@ -177,7 +177,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) else { #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rReq.Ignore (); break; diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 9f3c356eda46..13f80cc720a8 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -222,12 +222,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) rBindings.Invalidate (SID_ATTR_FILL_STYLE); } #if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -244,12 +244,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) rBindings.Invalidate (SID_ATTR_LINE_STYLE); } #if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -265,7 +265,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -289,7 +289,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -310,7 +310,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -372,7 +372,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -426,7 +426,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -471,12 +471,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) rBindings.Invalidate (SID_ATTR_FILL_STYLE); } #if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -548,12 +548,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) rBindings.Invalidate (SID_ATTR_FILL_STYLE); } #if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -610,12 +610,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) rBindings.Invalidate (SID_ATTR_FILL_STYLE); } #if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -650,7 +650,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -685,7 +685,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; @@ -700,7 +700,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) break; } #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif break; diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 32551c14bd9d..b942a5c262b1 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -281,7 +281,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( if(HasCurrentFunction( SID_BEZIER_EDIT ) ) GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); + StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); #endif rRequest.Ignore (); return NULL; @@ -294,7 +294,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( if(HasCurrentFunction(SID_BEZIER_EDIT) ) GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); #if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (SbERR_WRONG_ARGS); + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); #endif rRequest.Ignore (); return NULL; -- cgit