Remove inline renaming of title in ThumbnailViewItem

Change-Id: I8fa2cae3390dd1576aab531bc826b8bb5985eaf9
Reviewed-on: https://gerrit.libreoffice.org/25645
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

6 files changed, 4 insertions, 138 deletions

diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index ca24f93424ab..299778c51963 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -17,7 +17,6 @@ class RecentDocsViewItem : public ThumbnailViewItem
 public:
     RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL,
         const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId, long nThumbnailSize = 256);
-    virtual void setEditTitle (bool edit, bool bChangeFocus = true) override;
 
     /** Updates own highlight status based on the aPoint position.
 
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index 5ca9f3e7fefc..0ae23e552249 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -25,7 +25,6 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/vclmedit.hxx>
 #include <sfx2/dllapi.h>
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -34,10 +33,8 @@
 
 const int THUMBNAILVIEW_ITEM_CORNER = 5;
 
-class CheckBox;
-namespace vcl { class Font; }
-namespace vcl { class Window; }
 class ThumbnailView;
+class MouseEvent;
 
 namespace basegfx {
     class B2DPolygon;
@@ -106,9 +103,8 @@ public:
     void setHelpText (const OUString &sText) { maHelpText = sText; }
 
     virtual OUString getHelpText() const { return maHelpText; };
+    virtual OUString getTitle() const { return maTitle; };
 
-    virtual void setEditTitle (bool edit, bool bChangeFocus = true);
-    void updateTitleEditSize ();
     void setTitle (const OUString& rTitle);
 
     css::uno::Reference< css::accessibility::XAccessible >
@@ -117,7 +113,6 @@ public:
     void setDrawArea (const Rectangle &area);
 
     const Rectangle& getDrawArea () const { return maDrawArea; }
-    Rectangle getTextArea () const;
 
     virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight,
                                          const long nPadding, sal_uInt32 nMaxTextLength,
@@ -137,9 +132,6 @@ protected:
     Point maTextPos;
     Point maPrev1Pos;
     Rectangle maDrawArea;
-    bool mbEditTitle;
-    VclPtr<VclMultiLineEdit> mpTitleED;
-    Rectangle maTextEditMaxArea;
 };
 
 #endif // INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 1e0abecedcea..0d353700bd7c 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -101,13 +101,6 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR
     maPreview1 = TemplateAbstractView::scaleImg(aThumbnail, nThumbnailSize, nThumbnailSize);
 }
 
-void RecentDocsViewItem::setEditTitle (bool edit, bool bChangeFocus)
-{
-    // Unused parameters.
-    (void)edit;
-    (void)bChangeFocus;
-}
-
 Rectangle RecentDocsViewItem::updateHighlight(bool bVisible, const Point& rPoint)
 {
     Rectangle aRect(ThumbnailViewItem::updateHighlight(bVisible, rPoint));
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index fdc4ca3f6b2d..14d5c3991ce9 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -213,7 +213,7 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool)
     case MNI_RENAME:
     {
         ScopedVclPtrInstance< InputDialog > m_pTitleEditDlg( SfxResId(STR_RENAME_TEMPLATE).toString(), this);
-        OUString sOldTitle = maSelectedItem->getHelpText();
+        OUString sOldTitle = maSelectedItem->getTitle();
         m_pTitleEditDlg->SetEntryText( sOldTitle );
         m_pTitleEditDlg->HideHelpBtn();
 
@@ -224,7 +224,6 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool)
         if ( !sNewTitle.isEmpty() && sNewTitle != sOldTitle )
         {
             maSelectedItem->setTitle(sNewTitle);
-            maSelectedItem->setEditTitle(true);
         }
     }
         break;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 6f68e8444292..c8f2aa6727ba 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -799,12 +799,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt )
             mpStartSelRange = mFilteredItemList.begin() + nPos;
         }
 
-        if (pItem->isSelected())
-        {
-            bool bClickOnTitle = pItem->getTextArea().IsInside(rMEvt.GetPosPixel());
-            pItem->setEditTitle(bClickOnTitle);
-        }
-
         if (!pItem->isHighlighted())
             DrawItem(pItem);
 
@@ -1146,7 +1140,6 @@ void ThumbnailView::deselectItems()
     {
         if (p->isSelected())
         {
-            p->setEditTitle(false);
             p->setSelection(false);
 
             maItemStateHdl.Call(p);
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index c41ba8cf5409..0e36b29a9bec 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -44,62 +44,6 @@ using namespace ::com::sun::star;
 using namespace drawinglayer::attribute;
 using namespace drawinglayer::primitive2d;
 
-class ResizableMultiLineEdit : public VclMultiLineEdit
-{
-    private:
-        ThumbnailViewItem* mpItem;
-        bool mbIsInGrabFocus;
-
-    public:
-        ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem);
-
-        void SetInGrabFocus(bool bInGrabFocus) { mbIsInGrabFocus = bInGrabFocus; }
-
-        virtual bool PreNotify(NotifyEvent& rNEvt) override;
-        virtual void Modify() override;
-};
-
-ResizableMultiLineEdit::ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem) :
-    VclMultiLineEdit (pParent, WB_CENTER | WB_BORDER),
-    mpItem(pItem),
-    mbIsInGrabFocus(false)
-{
-}
-
-bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt)
-{
-    bool bDone = false;
-    if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
-    {
-        const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
-        vcl::KeyCode aCode = rKEvt.GetKeyCode();
-        switch (aCode.GetCode())
-        {
-            case KEY_RETURN:
-                mpItem->setTitle( GetText() );
-                SAL_FALLTHROUGH;
-            case KEY_ESCAPE:
-                mpItem->setEditTitle(false);
-                bDone = true;
-                break;
-            default:
-                break;
-        }
-    }
-    else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !mbIsInGrabFocus )
-    {
-        mpItem->setTitle( GetText() );
-        mpItem->setEditTitle(false, false);
-    }
-    return bDone || VclMultiLineEdit::PreNotify(rNEvt);
-}
-
-void ResizableMultiLineEdit::Modify()
-{
-    VclMultiLineEdit::Modify();
-    mpItem->updateTitleEditSize();
-}
-
 ThumbnailViewItem::ThumbnailViewItem(ThumbnailView &rView, sal_uInt16 nId)
     : mrParent(rView)
     , mnId(nId)
@@ -107,16 +51,11 @@ ThumbnailViewItem::ThumbnailViewItem(ThumbnailView &rView, sal_uInt16 nId)
     , mbSelected(false)
     , mbHover(false)
     , mxAcc()
-    , mbEditTitle(false)
-    , mpTitleED(nullptr)
-    , maTextEditMaxArea()
 {
-    mpTitleED = VclPtr<ResizableMultiLineEdit>::Create(&rView, this);
 }
 
 ThumbnailViewItem::~ThumbnailViewItem()
 {
-    mpTitleED.disposeAndClear();
     if( mxAcc.is() )
     {
         static_cast< ThumbnailViewItemAcc* >( mxAcc.get() )->ParentDestroyed();
@@ -126,8 +65,6 @@ ThumbnailViewItem::~ThumbnailViewItem()
 void ThumbnailViewItem::show (bool bVisible)
 {
     mbVisible = bVisible;
-    if (!mbVisible)
-        mpTitleED->Show(false);
 }
 
 void ThumbnailViewItem::setSelection (bool state)
@@ -152,7 +89,7 @@ Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, const Point& rPoint)
     }
     else
     {
-        if (isHighlighted() || mpTitleED->SupportsDoubleBuffering())
+        if (isHighlighted())
             bNeedsPaint = true;
         setHighlight(false);
     }
@@ -163,47 +100,6 @@ Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, const Point& rPoint)
     return Rectangle();
 }
 
-void ThumbnailViewItem::setEditTitle (bool edit, bool bChangeFocus)
-{
-    mbEditTitle = edit;
-    mpTitleED->Show(edit);
-    if (edit)
-    {
-        mpTitleED->SetText(maTitle);
-        updateTitleEditSize();
-        static_cast<ResizableMultiLineEdit*>(mpTitleED.get())->SetInGrabFocus(true);
-        mpTitleED->GrabFocus();
-        static_cast<ResizableMultiLineEdit*>(mpTitleED.get())->SetInGrabFocus(false);
-    }
-    else if (bChangeFocus)
-    {
-        mrParent.GrabFocus();
-    }
-}
-
-Rectangle ThumbnailViewItem::getTextArea() const
-{
-    Rectangle aTextArea(maTextEditMaxArea);
-
-    TextEngine aTextEngine;
-    aTextEngine.SetMaxTextWidth(maDrawArea.getWidth());
-    aTextEngine.SetText(maTitle);
-
-    long nTxtHeight = aTextEngine.GetTextHeight() + 6;
-    if (nTxtHeight < aTextArea.GetHeight())
-        aTextArea.SetSize(Size(aTextArea.GetWidth(), nTxtHeight));
-
-    return aTextArea;
-}
-
-void ThumbnailViewItem::updateTitleEditSize()
-{
-    Rectangle aTextArea = getTextArea();
-    Point aPos = aTextArea.TopLeft();
-    Size aSize = aTextArea.GetSize();
-    mpTitleED->SetPosSizePixel(aPos, aSize);
-}
-
 void ThumbnailViewItem::setTitle (const OUString& rTitle)
 {
     if (mrParent.renameItem(this, rTitle))
@@ -245,12 +141,6 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con
     aPos.Y() = maDrawArea.getY() + nThumbnailHeight + nPadding * 2;
     aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2;
     maTextPos = aPos;
-
-    // Calculate the text edit max area
-    aPos = Point(maDrawArea.getX() + nPadding, maTextPos.getY());
-    Size aEditSize(maDrawArea.GetWidth() - nPadding * 2,
-                   maDrawArea.Bottom() - maTextPos.Y());
-    maTextEditMaxArea = Rectangle( aPos, aEditSize );
 }
 
 void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,