diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-06 05:23:43 -0430 |
|---|---|---|
| committer | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-06 05:23:43 -0430 |
| commit | 5eb74b1fcad83c605cc00e377460e0ae313d7277 (patch) | |
| tree | dae1a098290f55460e0da0a024105c1e28e19410 /sfx2/Library_sfx.mk | |
| parent | dafa1f576482bc7a0086c353ffff0dbd594a7915 (diff) | |
| parent | fa99c1ea4f6d450cc12998d4513ed8cf77bafcc9 (diff) | |
Merge branch 'feature/template-dialog'
Conflicts:
sfx2/Library_sfx.mk
sfx2/inc/sfx2/sfxcommands.h
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/appl/appserv.cxx
svtools/Library_svt.mk
Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6
Diffstat (limited to 'sfx2/Library_sfx.mk')
| -rw-r--r-- | sfx2/Library_sfx.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 562d3c24454e..709cdeea525e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -60,9 +60,11 @@ $(eval $(call gb_Library_add_defs,sfx,\ endif $(eval $(call gb_Library_use_libraries,sfx,\ + basegfx \ comphelper \ cppu \ cppuhelper \ + drawinglayer \ fwe \ i18nisolang1 \ sal \ @@ -143,6 +145,14 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/control/shell \ sfx2/source/control/sorgitm \ sfx2/source/control/statcach \ + sfx2/source/control/templateview \ + sfx2/source/control/templateviewitem \ + sfx2/source/control/templatefolderview \ + sfx2/source/control/templatefolderviewitem \ + sfx2/source/control/templatesearchview \ + sfx2/source/control/thumbnailviewitem \ + sfx2/source/control/thumbnailviewacc \ + sfx2/source/control/thumbnailview \ sfx2/source/control/unoctitm \ sfx2/source/dialog/alienwarn \ sfx2/source/dialog/basedlgs \ @@ -152,6 +162,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/dialog/filedlghelper \ sfx2/source/dialog/filtergrouping \ sfx2/source/dialog/itemconnect \ + sfx2/source/dialog/inputdlg \ sfx2/source/dialog/mailmodel \ sfx2/source/dialog/mgetempl \ sfx2/source/dialog/navigat \ @@ -212,6 +223,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/sfxmodelfactory \ sfx2/source/doc/syspath \ sfx2/source/doc/zoomitem \ + sfx2/source/doc/templatedlg \ sfx2/source/explorer/nochaos \ sfx2/source/inet/inettbc \ sfx2/source/menu/mnuitem \ |