remove unused GalleryItemFlags::ThemeName

Change-Id: Iaf1c82ee454139553dbc9fd1b0cf38b9e7971fdd
Reviewed-on: https://gerrit.libreoffice.org/63931
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 8 insertions, 17 deletions

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index b82df1554c25..f980ab852405 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1296,8 +1296,6 @@ svl/source/numbers/zformat.cxx:386
     enum BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM19
 svtools/source/contnr/fileview.cxx:110
     enum FileViewFlags SHOW_ONLYTITLE
-svx/inc/galbrws2.hxx:53
-    enum GalleryItemFlags ThemeName
 svx/source/inc/docrecovery.hxx:85
     enum EDocStates TryLoadBackup
 svx/source/inc/docrecovery.hxx:86
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 02394d5114bc..196ff7dfad6f 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -50,13 +50,12 @@ enum class GalleryBrowserTravel
 };
 
 enum class GalleryItemFlags {
-    ThemeName  = 0x0001,
     Title      = 0x0002,
     Path       = 0x0004
 };
 namespace o3tl
 {
-    template<> struct typed_flags<GalleryItemFlags> : is_typed_flags<GalleryItemFlags, 0x0007> {};
+    template<> struct typed_flags<GalleryItemFlags> : is_typed_flags<GalleryItemFlags, 0x0006> {};
 }
 
 
@@ -132,7 +131,7 @@ private:
 
 public:
 
-    static OUString     GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, GalleryItemFlags nItemTextFlags );
+    static OUString     GetItemText( const SgaObject& rObj, GalleryItemFlags nItemTextFlags );
 
 public:
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index dd19615bb66f..1e89c6cc4801 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1115,7 +1115,7 @@ void GalleryBrowser2::Execute(const OString &rIdent)
 
             if( pObj )
             {
-                const OUString  aOldTitle( GetItemText( *mpCurTheme, *pObj, GalleryItemFlags::Title ) );
+                const OUString  aOldTitle( GetItemText( *pObj, GalleryItemFlags::Title ) );
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 ScopedVclPtr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog(GetFrameWeld(), aOldTitle));
@@ -1162,18 +1162,12 @@ void GalleryBrowser2::Execute(const OString &rIdent)
     }
 }
 
-OUString GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, GalleryItemFlags nItemTextFlags )
+OUString GalleryBrowser2::GetItemText( const SgaObject& rObj, GalleryItemFlags nItemTextFlags )
 {
     OUString          aRet;
 
     const INetURLObject& aURL(rObj.GetURL());
 
-    if( nItemTextFlags & GalleryItemFlags::ThemeName )
-    {
-        aRet += rTheme.GetName();
-        aRet += " - ";
-    }
-
     if( nItemTextFlags & GalleryItemFlags::Title )
     {
         OUString aTitle( rObj.GetTitle() );
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 1a95c134bedb..af00c3fd15e0 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -335,7 +335,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt)
         if(pObj)
         {
             aBitmapEx = pObj->createPreviewBitmapEx(aSize);
-            aItemTextTitle = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GalleryItemFlags::Title);
+            aItemTextTitle = GalleryBrowser2::GetItemText(*pObj, GalleryItemFlags::Title);
 
             mpTheme->SetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aSize, aItemTextTitle, aItemTextPath);
         }
@@ -451,7 +451,7 @@ OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 /*nColumnId*/) cons
 
         if( pObj )
         {
-            sRet = GalleryBrowser2::GetItemText( *mpTheme, *pObj, GalleryItemFlags::Title );
+            sRet = GalleryBrowser2::GetItemText( *pObj, GalleryItemFlags::Title );
         }
     }
 
@@ -515,8 +515,8 @@ void GalleryListView::PaintField(vcl::RenderContext& rDev, const tools::Rectangl
             if(pObj)
             {
                 aBitmapEx = pObj->createPreviewBitmapEx(aSize);
-                aItemTextTitle = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GalleryItemFlags::Title);
-                aItemTextPath = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GalleryItemFlags::Path);
+                aItemTextTitle = GalleryBrowser2::GetItemText(*pObj, GalleryItemFlags::Title);
+                aItemTextPath = GalleryBrowser2::GetItemText(*pObj, GalleryItemFlags::Path);
 
                 mpTheme->SetPreviewBitmapExAndStrings(mnCurRow, aBitmapEx, aSize, aItemTextTitle, aItemTextPath);
             }