diff options
author | Andre Fischer <af@apache.org> | 2013-05-03 13:01:13 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:28 +0100 |
commit | 1571b476038c46777edd3df610c83dc761f22cf9 (patch) | |
tree | 55070a75e4c33217a8033541b54f9085d1df0a15 /svx/Library_svx.mk | |
parent | Related: #i122140# add 'None' entry to underline style... (diff) | |
download | core-1571b476038c46777edd3df610c83dc761f22cf9.tar.gz core-1571b476038c46777edd3df610c83dc761f22cf9.zip |
Resolves: #i122218# Add new sidebar panel...
for inserting shapes into Draw documents
(cherry picked from commit 5e09229d726cbc288719c7466b277a4eb5bb244b)
Conflicts:
sd/source/ui/view/drviewsa.cxx
sfx2/Package_inc.mk
svx/inc/svx/dialogs.hrc
Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar
(cherry picked from commit 99572ff12af758a256703884811c7915c79f27ec)
Conflicts:
sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
Related: #i122218# Added more missing files
(cherry picked from commit cdc8cb702630938c673255638aecbd2dd5c53ed7)
fix up to build
Change-Id: I098976d787e6a91d36aac98a5917f48b50872087
9c6f4d957924e177922e26606173d1b238b8006e
ceb9b720c08fb1db5b418c618e280b9b68eda2cf
01712631eacbd3e58e2cd04d1903bbcb0ecb9301
Diffstat (limited to 'svx/Library_svx.mk')
-rw-r--r-- | svx/Library_svx.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 6279f09f6992..b4b4051b0c18 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ cppu \ drawinglayer \ editeng \ + fwe \ fwk \ i18nlangtag \ sal \ @@ -200,6 +201,8 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/sidebar/tools/PopupContainer \ svx/source/sidebar/tools/Popup \ svx/source/sidebar/tools/ValueSetWithTextControl \ + svx/source/sidebar/insert/InsertPropertyPanel \ + svx/source/sidebar/insert/SimpleToolBoxController \ svx/source/stbctrls/pszctrl \ svx/source/stbctrls/insctrl \ svx/source/stbctrls/selctrl \ |