cui/source/options/connpooloptions.cxx | 2 +-
cui/source/options/optgdlg.cxx | 6 +++---
cui/source/options/optlingu.cxx | 4 ++--
cui/source/options/optsave.cxx | 2 +-
cui/source/options/treeopt.cxx | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 69a3bcdaa54700a372151af52ccfbb0deed9db45
Author: Baole Fang <baole.f...@gmail.com>
AuthorDate: Sat May 27 13:23:25 2023 -0400
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Jun 2 17:02:33 2023 +0200
tdf#43157: Clean up OSL_FAIL
Change-Id: Id4472bd810263ca842d14af6ad4a1359c002fb6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152344
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/cui/source/options/connpooloptions.cxx
b/cui/source/options/connpooloptions.cxx
index c067af0c3e47..80c202a78c0b 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -145,7 +145,7 @@ namespace offapp
UpdateDriverList(pDriverSettings->getSettings());
else
{
- OSL_FAIL("ConnectionPoolOptionsPage::implInitControls: missing the
DriverTimeouts item!");
+ SAL_WARN("cui.options",
"ConnectionPoolOptionsPage::implInitControls: missing the DriverTimeouts
item!");
UpdateDriverList(DriverPoolingSettings());
}
saveDriverList();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 249d7b0318b6..da546d760d05 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -702,7 +702,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break;
case 3: eSet = SFX_SYMBOLS_SIZE_32; break;
default:
- OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_xIconSizeLB should not be possible!" );
+ SAL_WARN("cui.options", "OfaViewTabPage::FillItemSet(): This
state of m_xIconSizeLB should not be possible!");
}
aMiscOptions.SetSymbolsSize( eSet );
}
@@ -718,7 +718,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
case 1: eSet = ToolBoxButtonSize::Small; break;
case 2: eSet = ToolBoxButtonSize::Large; break;
default:
- OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_xSidebarIconSizeLB should not be possible!" );
+ SAL_WARN("cui.options", "OfaViewTabPage::FillItemSet(): This
state of m_xSidebarIconSizeLB should not be possible!");
}
officecfg::Office::Common::Misc::SidebarIconSize::set(static_cast<sal_Int16>(eSet),
xChanges);
}
@@ -734,7 +734,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
case 1: eSet = ToolBoxButtonSize::Small; break;
case 2: eSet = ToolBoxButtonSize::Large; break;
default:
- OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_xNotebookbarIconSizeLB should not be possible!" );
+ SAL_WARN("cui.options", "OfaViewTabPage::FillItemSet(): This
state of m_xNotebookbarIconSizeLB should not be possible!");
}
officecfg::Office::Common::Misc::NotebookbarIconSize::set(static_cast<sal_Int16>(eSet),
xChanges);
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 584c86c5f7d6..d04de6aed890 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1519,7 +1519,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&,
rBtn, void)
}
else
{
- OSL_FAIL( "rBtn unexpected value" );
+ SAL_WARN("cui.options", "rBtn unexpected value");
}
}
@@ -1551,7 +1551,7 @@ IMPL_LINK(SvxLinguTabPage, SelectHdl_Impl,
weld::TreeView&, rBox, void)
}
else
{
- OSL_FAIL( "rBox unexpected value" );
+ SAL_WARN("cui.options", "rBtn unexpected value");
}
}
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 7799da84c8b6..56e0f4486730 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -422,7 +422,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
case APP_IMPRESS : sReplace =
"com.sun.star.presentation.PresentationDocument";break;
case APP_DRAW : sReplace =
"com.sun.star.drawing.DrawingDocument";break;
case APP_MATH : sReplace =
"com.sun.star.formula.FormulaProperties";break;
- default: OSL_FAIL("illegal user data");
+ default: SAL_WARN("cui.options", "illegal user data");
}
sCommand = sCommand.replaceFirst("%1", sReplace);
Reference< XEnumeration > xList =
xQuery->createSubSetEnumerationByQuery(sCommand);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index c32fb8d5fa7e..98d8a3e77c7d 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1207,7 +1207,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId,
const SfxItemSet& rSet
default:
{
- OSL_FAIL( "Unhandled option in ApplyItemSet" );
+ SAL_WARN("cui.options", "Unhandled option in ApplyItemSet");
}
break;
}
