svl/Library_svl.mk | 1 - svl/source/inc/stringio.hxx | 38 -------------------------------------- svl/source/items/macitem.cxx | 5 ++--- svl/source/items/stringio.cxx | 29 ----------------------------- 4 files changed, 2 insertions(+), 71 deletions(-)
New commits: commit 590d456dfb7fa1f4f6511db1fac00b0b174e873c Author: Noel Grandin <[email protected]> AuthorDate: Thu Feb 26 14:49:40 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Feb 27 07:49:17 2026 +0100 inline writeByteString no longer serves any purpose Change-Id: Ib8d1b642eddd6134785e295f2362745eb19c5a05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200463 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index ee8088c51e7d..f8fe1a073a3a 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -138,7 +138,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/items/sitem \ svl/source/items/slstitm \ svl/source/items/srchitem \ - svl/source/items/stringio \ svl/source/items/stritem \ svl/source/items/style \ svl/source/items/stylepool \ diff --git a/svl/source/inc/stringio.hxx b/svl/source/inc/stringio.hxx deleted file mode 100644 index b41d4d482113..000000000000 --- a/svl/source/inc/stringio.hxx +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SVL_SOURCE_INC_STRINGIO_HXX -#define INCLUDED_SVL_SOURCE_INC_STRINGIO_HXX - -#include <rtl/ustring.hxx> - -class SvStream; - -/** Write a byte string representation of a Unicode string into a stream. - - @param rStream Some (output) stream. Its Stream/TargetCharSets must - be set to correct values! - - @param rString Some Unicode string. - */ -void writeByteString(SvStream& rStream, std::u16string_view rString); - -#endif // INCLUDED_SVL_SOURCE_INC_STRINGIO_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index b71399384b14..16a22285f00e 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -25,7 +25,6 @@ #include <tools/stream.hxx> #include <svl/macitem.hxx> -#include <stringio.hxx> #include <algorithm> #include <utility> @@ -142,8 +141,8 @@ SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const break; const SvxMacro& rMac = rEntry.second; rStream.WriteUInt16( static_cast<sal_uInt16>(rEntry.first) ); - writeByteString(rStream, rMac.GetLibName()); - writeByteString(rStream, rMac.GetMacName()); + rStream.WriteUniOrByteString(rMac.GetLibName()); + rStream.WriteUniOrByteString(rMac.GetMacName()); if( SVX_MACROTBL_VERSION40 <= nVersion ) rStream.WriteUInt16( rMac.GetScriptType() ); diff --git a/svl/source/items/stringio.cxx b/svl/source/items/stringio.cxx deleted file mode 100644 index d0e735e28aaf..000000000000 --- a/svl/source/items/stringio.cxx +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <stringio.hxx> - -#include <tools/stream.hxx> - -void writeByteString(SvStream& rStream, std::u16string_view rString) -{ - rStream.WriteUniOrByteString(rString); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
