[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source
Rafael Dominguez
rdominguez at kemper.freedesktop.org
Sat Jul 7 01:12:29 PDT 2012
sfx2/inc/sfx2/templatefolderview.hxx | 2 +-
sfx2/inc/sfx2/templatefolderviewitem.hxx | 4 +++-
sfx2/inc/sfx2/thumbnailviewitem.hxx | 4 +++-
sfx2/source/control/templateview.hrc | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit dc8effc97bee41454aa836929c7d747522bb240a
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Fri Jul 6 22:37:14 2012 -0430
Fix Global resource identifier >= 256 warning.
Change-Id: I717aa1559c63439a90b4b7d5607a1030c3eacd36
diff --git a/sfx2/source/control/templateview.hrc b/sfx2/source/control/templateview.hrc
index cc26a18..dc496f2 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -6,4 +6,4 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#define IMG_TEMPLATE_VIEW_CLOSE 1
+#define IMG_TEMPLATE_VIEW_CLOSE 256
commit 1c6cd04a1b0394dfd2ee317b36663ce4051c461d
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Fri Jul 6 22:23:57 2012 -0430
Export TemplateFolderView symbols.
Change-Id: Ieab7008afe116d3f427df25cfdb899f05fe43e6f
diff --git a/sfx2/inc/sfx2/templatefolderview.hxx b/sfx2/inc/sfx2/templatefolderview.hxx
index df9860f..04a474d 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -27,7 +27,7 @@ enum FILTER_APPLICATION
FILTER_APP_DRAW
};
-class TemplateFolderView : public ThumbnailView
+class SFX2_DLLPUBLIC TemplateFolderView : public ThumbnailView
{
public:
commit 122cfd73f8dcebb6128f5a8213224aa1846d2b31
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Fri Jul 6 22:19:37 2012 -0430
Convert all ThumbnailViewItem and subclasses to class instead of struct.
Change-Id: I280a37ada544d35e0895300027fe46dd1e286e91
diff --git a/sfx2/inc/sfx2/templatefolderviewitem.hxx b/sfx2/inc/sfx2/templatefolderviewitem.hxx
index 16fb646..d7684cd 100644
--- a/sfx2/inc/sfx2/templatefolderviewitem.hxx
+++ b/sfx2/inc/sfx2/templatefolderviewitem.hxx
@@ -14,8 +14,10 @@
class TemplateViewItem;
-struct TemplateFolderViewItem : public ThumbnailViewItem
+class TemplateFolderViewItem : public ThumbnailViewItem
{
+public:
+
BitmapEx maPreview2;
std::vector<TemplateViewItem*> maTemplates;
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index ac61170..33c9b6f 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -58,8 +58,10 @@ struct ThumbnailItemAttributes
drawinglayer::attribute::FontAttribute aFontAttr;
};
-struct ThumbnailViewItem
+class ThumbnailViewItem
{
+public:
+
ThumbnailView &mrParent;
sal_uInt16 mnId;
bool mbVisible;
More information about the Libreoffice-commits
mailing list