diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-11 15:00:37 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:07 -0400 |
| commit | 0b7e86ac50139747432bd0f15a363a4f71e6a322 (patch) | |
| tree | 1e71c37ad3cda8534ac856883ef65d13ca8c2670 | |
| parent | 35a4e75b8cf71cc66e8148a19954cc3c2db272db (diff) | |
remove some unnecessary casting
Change-Id: I451df09db58256fed68ce8537b2d8eb4b6ab6942
Reviewed-on: https://gerrit.libreoffice.org/26184
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 2ed5fa14f0e7624db241fde26e10fdd1009adfc7)
| -rw-r--r-- | sc/source/core/data/document.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/xml/sheetdata.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/salprn-gtk.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 1e0b41514faa..19781108fba7 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6502,12 +6502,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 @@ -6529,11 +6529,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 e5e771dc09a1..1d1cfb93487d 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/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 6a9670ce1dad..bf1a68a1dc72 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1710,7 +1710,7 @@ Size Menu::ImplCalcSize( vcl::Window* pWin ) if( pWindow->GetNativeControlRegion( ControlType(CTRL_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 b7da4f14ebda..8ab73b8187b1 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -981,7 +981,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); } } } |