[Libreoffice-commits] core.git: sw/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 9 20:53:08 UTC 2021


 sw/source/core/frmedt/feshview.cxx |   19 -------------------
 1 file changed, 19 deletions(-)

New commits:
commit aa9cb8e14749e7fb7a83b55a2bb095501f731a18
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 8 16:18:55 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jun 9 22:52:24 2021 +0200

    -Werror,-Wunused-but-set-variable (Clang 13 trunk)
    
    For both aRelNullPt local variables in SwFEShell::ImpEndCreate and
    SwFEShell::CheckUnboundObjects the (only) reads were removed with
    5f7d6695ab561758acb27a93f14e08ee960324d5 "INTEGRATION: CWS swdrawpositioning".
    (And nIdent in SwFEShell::CheckUnboundObjects thus becomes unused, too.)
    
    Change-Id: Ifb4851b4e10b7370f2fc2f25bcdba77d532e77a5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116845
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index d0a980fed49b..6e070d448399 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2133,12 +2133,6 @@ bool SwFEShell::ImpEndCreate()
             GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(bRestore);
         }
 
-        Point aRelNullPt;
-        if( OBJ_CAPTION == nIdent )
-            aRelNullPt = static_cast<SdrCaptionObj&>(rSdrObj).GetTailPos();
-        else
-            aRelNullPt = rBound.TopLeft();
-
         aSet.Put( aAnch );
         aSet.Put( SwFormatSurround( css::text::WrapTextMode_THROUGH ) );
         // OD 2004-03-30 #i26791# - set horizontal position
@@ -2826,12 +2820,6 @@ void SwFEShell::CheckUnboundObjects()
                 pPage = pLast;
             OSL_ENSURE( pPage, "Page not found." );
 
-            // Alien identifier should roll into the default,
-            // Duplications are possible!!
-            sal_uInt16 nIdent =
-                    Imp()->GetDrawView()->GetCurrentObjInventor() == SdrInventor::Default ?
-                            Imp()->GetDrawView()->GetCurrentObjIdentifier() : 0xFFFF;
-
             SwFormatAnchor aAnch;
             {
             const SwContentFrame *const pAnch = ::FindAnchor(pPage, aPt, true);
@@ -2850,13 +2838,6 @@ void SwFEShell::CheckUnboundObjects()
                                             RES_SURROUND, RES_ANCHOR>{} );
             aSet.Put( aAnch );
 
-            Point aRelNullPt;
-
-            if( OBJ_CAPTION == nIdent )
-                aRelNullPt = static_cast<SdrCaptionObj*>(pObj)->GetTailPos();
-            else
-                aRelNullPt = rBound.TopLeft();
-
             aSet.Put( aAnch );
             aSet.Put( SwFormatSurround( css::text::WrapTextMode_THROUGH ) );
             SwFrameFormat* pFormat = getIDocumentLayoutAccess().MakeLayoutFormat( RndStdIds::DRAW_OBJECT, &aSet );


More information about the Libreoffice-commits mailing list