[Libreoffice-commits] core.git: sc/source svtools/source vcl/source vcl/unx
Noel Grandin
noelgrandin at gmail.com
Sun Jun 12 07:21:54 UTC 2016
sc/source/core/data/document.cxx | 8 ++++----
sc/source/filter/xml/sheetdata.cxx | 2 +-
svtools/source/control/toolbarmenu.cxx | 4 ++--
vcl/source/window/menu.cxx | 8 ++++----
vcl/unx/gtk/salprn-gtk.cxx | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 2ed5fa14f0e7624db241fde26e10fdd1009adfc7
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sat Jun 11 15:00:37 2016 +0200
remove some unnecessary casting
Change-Id: I451df09db58256fed68ce8537b2d8eb4b6ab6942
Reviewed-on: https://gerrit.libreoffice.org/26184
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2fcce07..8e22b96 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6499,12 +6499,12 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex ) const
return ScAddress(nCol, nRow, nTab);
OSL_FAIL("note not found");
- return ScAddress(ScAddress::INITIALIZE_INVALID);
+ return ScAddress::INITIALIZE_INVALID;
}
}
OSL_FAIL("note not found");
- return ScAddress(ScAddress::INITIALIZE_INVALID);
+ return ScAddress::INITIALIZE_INVALID;
}
ScAddress ScDocument::GetNotePosition( size_t nIndex, SCTAB nTab ) const
@@ -6526,11 +6526,11 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex, SCTAB nTab ) const
return ScAddress(nCol, nRow, nTab);
OSL_FAIL("note not found");
- return ScAddress(ScAddress::INITIALIZE_INVALID);
+ return ScAddress::INITIALIZE_INVALID;
}
OSL_FAIL("note not found");
- return ScAddress(ScAddress::INITIALIZE_INVALID);
+ return ScAddress::INITIALIZE_INVALID;
}
SCROW ScDocument::GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) const
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index e5e771d..1d1cfb9 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -28,7 +28,7 @@
ScSheetSaveData::ScSheetSaveData() :
mnStartTab( -1 ),
mnStartOffset( -1 ),
- maPreviousNote( OUString(), OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ),
+ maPreviousNote( OUString(), OUString(), ScAddress::INITIALIZE_INVALID ),
mbInSupportedSave( false )
{
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index c919c6b..51f1e8e 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -548,7 +548,7 @@ static long ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, l
if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_ITEM_CHECK_MARK))
{
if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, ControlPart(PART_MENU_ITEM_CHECK_MARK),
- aCtrlRegion, ControlState(ControlState::ENABLED), aVal, OUString(),
+ aCtrlRegion, ControlState::ENABLED, aVal, OUString(),
aNativeBounds, aNativeContent)
)
{
@@ -559,7 +559,7 @@ static long ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, l
if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_ITEM_RADIO_MARK))
{
if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, ControlPart(PART_MENU_ITEM_RADIO_MARK),
- aCtrlRegion, ControlState(ControlState::ENABLED), aVal, OUString(),
+ aCtrlRegion, ControlState::ENABLED, aVal, OUString(),
aNativeBounds, aNativeContent)
)
{
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e835c83..c128f54 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1369,7 +1369,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, lo
if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_ITEM_CHECK_MARK))
{
if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, ControlPart(PART_MENU_ITEM_CHECK_MARK),
- aCtrlRegion, ControlState(ControlState::ENABLED), aVal, OUString(),
+ aCtrlRegion, ControlState::ENABLED, aVal, OUString(),
aNativeBounds, aNativeContent))
{
rCheckHeight = aNativeBounds.GetHeight();
@@ -1379,7 +1379,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, lo
if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_ITEM_RADIO_MARK))
{
if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, ControlPart(PART_MENU_ITEM_RADIO_MARK),
- aCtrlRegion, ControlState(ControlState::ENABLED), aVal, OUString(),
+ aCtrlRegion, ControlState::ENABLED, aVal, OUString(),
aNativeBounds, aNativeContent))
{
rRadioHeight = aNativeBounds.GetHeight();
@@ -1399,7 +1399,7 @@ bool Menu::ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Siz
if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_SUBMENU_ARROW))
{
if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, ControlPart(PART_MENU_SUBMENU_ARROW),
- aCtrlRegion, ControlState(ControlState::ENABLED),
+ aCtrlRegion, ControlState::ENABLED,
aVal, OUString(), aNativeBounds, aNativeContent))
{
Size aSize(aNativeContent.GetWidth(), aNativeContent.GetHeight());
@@ -1648,7 +1648,7 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
if( pWindow->GetNativeControlRegion( ControlType::Menubar,
ControlPart(PART_ENTIRE_CONTROL),
aCtrlRegion,
- ControlState(ControlState::ENABLED),
+ ControlState::ENABLED,
aVal,
OUString(),
aNativeBounds,
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 5dd8ded..cfba6be 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -976,7 +976,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
{
aFilterData.realloc(aFilterData.getLength()+1);
aFilterData[aFilterData.getLength()-1].Name = "PageRange";
- aFilterData[aFilterData.getLength()-1].Value <<= OUString(OUString::number(i + 1));
+ aFilterData[aFilterData.getLength()-1].Value <<= OUString::number(i + 1);
}
}
}
More information about the Libreoffice-commits
mailing list