[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source solenv/clang-format svtools/inc svtools/Library_svt.mk svtools/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 18 10:19:44 UTC 2020


 compilerplugins/clang/constantparam.booleans.results |    4 -
 dbaccess/source/ui/app/DocumentInfoPreview.hxx       |    2 
 solenv/clang-format/excludelist                      |    2 
 svtools/Library_svt.mk                               |    1 
 svtools/inc/svmedit2.hxx                             |   43 --------------
 svtools/source/edit/svmedit2.cxx                     |   55 -------------------
 6 files changed, 107 deletions(-)

New commits:
commit 2ff43210210492fb5b656eb60262163c6fe62b64
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 17 12:39:24 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 18 12:18:59 2020 +0200

    remove newly unused ExtMultiLineEdit
    
    Change-Id: If9a1639d28aa7a540f301657387a04309ba82580
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100873
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index 0891a2f691c8..a7997ecceac1 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -3398,10 +3398,6 @@ svl/source/passwordcontainer/passwordcontainer.hxx:151
     void NamePassRecord::RemovePasswords(signed char)
     signed char nStatus
     1
-svtools/inc/svmedit2.hxx:36
-    void ExtMultiLineEdit::SetAttrib(const class TextAttrib &,unsigned int,int,int)
-    int nStart
-    0
 svtools/source/control/valueimp.hxx:213
     void ValueItemAcc::FireAccessibleEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short nEventId
diff --git a/dbaccess/source/ui/app/DocumentInfoPreview.hxx b/dbaccess/source/ui/app/DocumentInfoPreview.hxx
index 2cacb741937e..44fbbba1d3de 100644
--- a/dbaccess/source/ui/app/DocumentInfoPreview.hxx
+++ b/dbaccess/source/ui/app/DocumentInfoPreview.hxx
@@ -24,8 +24,6 @@
 
 namespace com :: sun :: star :: uno { template <typename > class Reference; }
 
-class ExtMultiLineEdit;
-
 namespace com::sun::star {
     namespace document { class XDocumentProperties; }
     namespace util { struct DateTime; }
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index a33769547967..72626c886579 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12957,7 +12957,6 @@ svl/source/uno/pathservice.cxx
 svl/unx/source/svdde/ddedummy.cxx
 svtools/inc/strings.hxx
 svtools/inc/svmedit.hxx
-svtools/inc/svmedit2.hxx
 svtools/inc/table/defaultinputhandler.hxx
 svtools/inc/table/gridtablerenderer.hxx
 svtools/inc/table/tablecontrol.hxx
@@ -13024,7 +13023,6 @@ svtools/source/dialogs/prnsetup.cxx
 svtools/source/dialogs/restartdialog.cxx
 svtools/source/edit/editsyntaxhighlighter.cxx
 svtools/source/edit/svmedit.cxx
-svtools/source/edit/svmedit2.cxx
 svtools/source/edit/textwindowpeer.cxx
 svtools/source/filter/DocumentToGraphicRenderer.cxx
 svtools/source/filter/SvFilterOptionsDialog.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f094f0ed0cd2..3367324e843a 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -113,7 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/dialogs/ServerDetailsControls \
     svtools/source/edit/editsyntaxhighlighter \
     svtools/source/edit/svmedit \
-    svtools/source/edit/svmedit2 \
     svtools/source/edit/textwindowpeer \
     svtools/source/filter/SvFilterOptionsDialog \
     svtools/source/filter/DocumentToGraphicRenderer \
diff --git a/svtools/inc/svmedit2.hxx b/svtools/inc/svmedit2.hxx
deleted file mode 100644
index 7d45700349a9..000000000000
--- a/svtools/inc/svmedit2.hxx
+++ /dev/null
@@ -1,43 +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_SVTOOLS_SVMEDIT2_HXX
-#define INCLUDED_SVTOOLS_SVMEDIT2_HXX
-
-#include "svmedit.hxx"
-
-class TextAttrib;
-
-class ExtMultiLineEdit final : public MultiLineEdit
-{
-public:
-                    ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle );
-
-                    // methods of TextView
-    void            InsertText( const OUString& rNew );
-    void            SetAutoScroll( bool bAutoScroll );
-
-                    // methods of TextEngine
-    void            SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 nStart, sal_Int32 nEnd );
-    void            SetLeftMargin( sal_uInt16 nLeftMargin );
-    sal_uInt32      GetParagraphCount() const;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
deleted file mode 100644
index fde13f6c7f51..000000000000
--- a/svtools/source/edit/svmedit2.cxx
+++ /dev/null
@@ -1,55 +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 <svmedit2.hxx>
-#include <vcl/xtextedt.hxx>
-#include <vcl/textview.hxx>
-
-ExtMultiLineEdit::ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) :
-    MultiLineEdit( pParent, nWinStyle )
-{
-}
-
-void ExtMultiLineEdit::InsertText( const OUString& rNew )
-{
-    GetTextView()->InsertText( rNew );
-}
-
-void ExtMultiLineEdit::SetAutoScroll( bool bAutoScroll )
-{
-    GetTextView()->SetAutoScroll( bAutoScroll );
-}
-
-void ExtMultiLineEdit::SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 nStart, sal_Int32 nEnd )
-{
-    GetTextEngine()->SetAttrib( rAttr, nPara, nStart, nEnd );
-}
-
-void ExtMultiLineEdit::SetLeftMargin( sal_uInt16 nLeftMargin )
-{
-    GetTextEngine()->SetLeftMargin( nLeftMargin );
-}
-
-sal_uInt32 ExtMultiLineEdit::GetParagraphCount() const
-{
-    return GetTextEngine()->GetParagraphCount();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list