mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused GalleryItemFlags::ThemeName

Browse Source 
Change-Id: Iaf1c82ee454139553dbc9fd1b0cf38b9e7971fdd
Reviewed-on: https://gerrit.libreoffice.org/63931
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-11-22 15:00:07 +02:00
parent 969d96b3a8
commit 5a291af996
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/unusedenumconstants.readonly.results
View File

@ -1296,8 +1296,6 @@ svl/source/numbers/zformat.cxx:386
enum BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM19 enum BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM19
svtools/source/contnr/fileview.cxx:110 svtools/source/contnr/fileview.cxx:110
enum FileViewFlags SHOW_ONLYTITLE enum FileViewFlags SHOW_ONLYTITLE
svx/inc/galbrws2.hxx:53
enum GalleryItemFlags ThemeName
svx/source/inc/docrecovery.hxx:85 svx/source/inc/docrecovery.hxx:85
enum EDocStates TryLoadBackup enum EDocStates TryLoadBackup
svx/source/inc/docrecovery.hxx:86 svx/source/inc/docrecovery.hxx:86

5
svx/inc/galbrws2.hxx
View File

@ -50,13 +50,12 @@ enum class GalleryBrowserTravel
}; };
enum class GalleryItemFlags { enum class GalleryItemFlags {
ThemeName = 0x0001,
Title = 0x0002, Title = 0x0002,
Path = 0x0004 Path = 0x0004
}; };
namespace o3tl 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: public:
static OUString GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, GalleryItemFlags nItemTextFlags ); static OUString GetItemText( const SgaObject& rObj, GalleryItemFlags nItemTextFlags );
public: public:

10
svx/source/gallery2/galbrws2.cxx
View File

@ -1115,7 +1115,7 @@ void GalleryBrowser2::Execute(const OString &rIdent)
if( pObj ) if( pObj )
{ {
const OUString aOldTitle( GetItemText( *mpCurTheme, *pObj, GalleryItemFlags::Title ) ); const OUString aOldTitle( GetItemText( *pObj, GalleryItemFlags::Title ) );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog(GetFrameWeld(), aOldTitle)); 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; OUString aRet;
const INetURLObject& aURL(rObj.GetURL()); const INetURLObject& aURL(rObj.GetURL());
if( nItemTextFlags & GalleryItemFlags::ThemeName )
{
aRet += rTheme.GetName();
aRet += " - ";
}
if( nItemTextFlags & GalleryItemFlags::Title ) if( nItemTextFlags & GalleryItemFlags::Title )
{ {
OUString aTitle( rObj.GetTitle() ); OUString aTitle( rObj.GetTitle() );

8
svx/source/gallery2/galctrl.cxx
View File

@ -335,7 +335,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt)
if(pObj) if(pObj)
{ {
aBitmapEx = pObj->createPreviewBitmapEx(aSize); 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); mpTheme->SetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aSize, aItemTextTitle, aItemTextPath);
} }
@ -451,7 +451,7 @@ OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 /*nColumnId*/) cons
if( pObj ) 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) if(pObj)
{ {
aBitmapEx = pObj->createPreviewBitmapEx(aSize); aBitmapEx = pObj->createPreviewBitmapEx(aSize);
aItemTextTitle = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GalleryItemFlags::Title); aItemTextTitle = GalleryBrowser2::GetItemText(*pObj, GalleryItemFlags::Title);
aItemTextPath = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GalleryItemFlags::Path); aItemTextPath = GalleryBrowser2::GetItemText(*pObj, GalleryItemFlags::Path);
mpTheme->SetPreviewBitmapExAndStrings(mnCurRow, aBitmapEx, aSize, aItemTextTitle, aItemTextPath); mpTheme->SetPreviewBitmapExAndStrings(mnCurRow, aBitmapEx, aSize, aItemTextTitle, aItemTextPath);
} }