summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-12 11:29:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-12 12:05:40 +0000
commit2f295ad6857877f44ef568ab9bbd5784a9be19be (patch)
treebfb00e6d396371a3be56b8a806cc2948ca30388a /svx
parent0924fa483a4aa8f22da35986e3191a453a4736b9 (diff)
convert gallery files page to .ui
Change-Id: Ifd5c9b16f8f9a42e13f1139076f7616dd3e0f8d0
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/sdstring.src5
-rw-r--r--svx/source/gallery2/galbrws2.cxx4
-rw-r--r--svx/source/gallery2/galctrl.cxx31
3 files changed, 16 insertions, 24 deletions
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 6c3dad303ce1..c9a0f35a6a4f 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -2103,11 +2103,6 @@ String RID_SVXSTR_GALLERY_THEMEITEMS
Text [ en-US ] = "Theme Items";
};
-String RID_SVXSTR_GALLERY_FILESFOUND
-{
- Text [ en-US ] = "Files Found";
-};
-
String RID_SVXSTR_GALLERY_PREVIEW
{
Text [ en-US ] = "Preview";
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3a148984d4f5..8f57c3067b27 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -419,7 +419,7 @@ GalleryBrowser2::GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery*
mpCurTheme ( NULL ),
mpIconView ( new GalleryIconView( this, NULL ) ),
mpListView ( new GalleryListView( this, NULL ) ),
- mpPreview ( new GalleryPreview( this, NULL ) ),
+ mpPreview ( new GalleryPreview(this) ),
maViewBox ( this ),
maSeparator ( this, WB_VERT ),
maInfoBar ( this, WB_LEFT | WB_VCENTER ),
@@ -752,7 +752,7 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
mpIconView = new GalleryIconView( this, mpCurTheme );
mpListView = new GalleryListView( this, mpCurTheme );
- mpPreview = new GalleryPreview( this, mpCurTheme );
+ mpPreview = new GalleryPreview( this, WB_TABSTOP | WB_BORDER, mpCurTheme );
mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 4c7d32ac961f..4629ed27dd9a 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -38,34 +38,31 @@
#define GALLERY_BRWBOX_TITLE 1
#define GALLERY_BRWBOX_PATH 2
-
-GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
- Window( pParent, WB_TABSTOP | WB_BORDER ),
- DropTargetHelper( this ),
- DragSourceHelper( this ),
- mpTheme( pTheme )
+GalleryPreview::GalleryPreview(Window* pParent, WinBits nStyle, GalleryTheme* pTheme)
+ : Window(pParent, nStyle)
+ , DropTargetHelper(this)
+ , DragSourceHelper(this)
+ , mpTheme(pTheme)
{
-
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
}
-GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) :
- Window( pParent, rResId ),
- DropTargetHelper( this ),
- DragSourceHelper( this ),
- mpTheme( NULL )
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGalleryPreview(Window *pParent,
+ VclBuilder::stringmap &rMap)
{
-
- SetHelpId( HID_GALLERY_PREVIEW );
- InitSettings();
+ WinBits nWinBits = WB_TABSTOP;
+ OString sBorder = VclBuilder::extractCustomProperty(rMap);
+ if (!sBorder.isEmpty())
+ nWinBits |= WB_BORDER;
+ return new GalleryPreview(pParent, nWinBits);
}
-GalleryPreview::~GalleryPreview()
+Size GalleryPreview::GetOptimalSize() const
{
+ return LogicToPixel(Size(70, 88), MAP_APPFONT);
}
-
bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
{
bool bRet = true;