[Libreoffice-commits] core.git: Changes to 'feature/sidebaroptr'
Jan Holesovsky
kendy at suse.cz
Sat May 18 13:53:46 PDT 2013
New branch 'feature/sidebaroptr' available with the following commits:
commit 08f78d87c2e5538dc21953dfa740e9c5610e0843
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 17 23:36:03 2013 +0200
sidebar: The sidebar uses only small icons.
Force the Color toolbar buttons etc. to small icons too, otherwise
it's inconsistent.
Change-Id: I7eea09c47c2d2f888611d04b2177f490f4977ebb
commit be648667c249912aa326a27615b895acd648662b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 17 23:29:31 2013 +0200
sidebar: Kill DrawBevelBorder(), nobody uses that now.
Change-Id: I7901ad17515002c8568a46f9a11c0c9919c0841e
commit 4c8a2be3b30dc72dadd4211087e5675b364b48f8
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 17 23:23:24 2013 +0200
sidebar: Simplify the look of the toolboxes.
Get rid of the background (that is not based on the theme the user uses, so
will not play good with system integration), and just draw a shadow frame
around the toolbar buttons.
[We cannot get rid of that for good, the controls then look 'lost in space'
;-)]
Change-Id: I1325a341c9cf3e5a91e102e233916735de7f8064
commit 5c3e1a201ba4dd12442c1c99c2fae9ad123e043f
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 20:32:16 2013 +0100
Only register and use the Sidebar if it is globally enabled.
commit f25fb7880508cccb6d65463c8a806aac1f64970c
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 20:07:29 2013 +0100
disable sidebar menu option if it is disabled.
commit adf12302dbdf2f0ec24e4556c18780f7ac9b71b1
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 17:35:05 2013 +0100
Remove apparently un-needed change to look of task-panes.
Change-Id: I8ebd1cf4482d7dc47db3f732b0d06cb318568c5a
commit 7c7ad18b4e852da7fc3dbf502bdfb44c60f62b1d
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 17:25:36 2013 +0100
finally get the taskpane rendering again
NB. you need to re-build & install to sync. configuration after this.
commit c17acfe4cb368eb1b0d3f3d3ec188e74b1d7e717
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 16:14:11 2013 +0100
don't throw up the sidebar on start.
commit 655d027748f8b9ab2c358e7d394e70b6fc713447
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 14:16:52 2013 +0100
update to the right service name for new URLs.
commit d50a67a1467e4b6d6c98ea773b90fb6f79f03589
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 13:48:27 2013 +0100
tentatively restore more UNO / task-pane goo ...
commit 5e09c6aa57f406ccbeafb3b90a788d51ade45e68
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 12:25:23 2013 +0100
more reverts, first cut at making sidebar optional.
commit 65f823fe0ba0e072dc82af8121485146d2fa00a4
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 11:51:41 2013 +0100
add experimental option for sidebar to 'Advanced' pane.
commit b24ff3fea0af43fe7cbdcc860e477a90a5060706
Author: Michael Meeks <michael.meeks at suse.com>
Date: Thu May 16 20:36:08 2013 +0100
Restore FrameworkHelper taskpane URLs.
Change-Id: If14c8784f4ee15f7611d3cbbb04b1a78c9171bf7
commit 65a07cf7696a3df2c7b9e185ce054b9ed52445d0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 15 09:58:16 2013 +0100
various build fixes
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
commit 7057fd917dbd9791ca668acaea1a3689c837ccfc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 15 09:58:16 2013 +0100
setPosSizePixel->SetPosSizePixel
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
commit f233f45a6374721510de7e9634cc771aad51525e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 15 09:10:25 2013 +0100
move some new includes files to new include locations
Change-Id: I34b18fb2e0f1eae01eff5b8e849dd5f5744335f6
commit c1638f11c1eeb8406f1b701778a26ee510c15f40
Author: Andre Fischer <af at apache.org>
Date: Tue May 14 15:21:57 2013 +0000
Resolves: #i122302# Use tool bar controls for color controls...
in text property panel
(cherry picked from commit 3b252796e1126b5ec1216082f55b8d12017eaeb1)
Conflicts:
sfx2/Package_inc.mk
sfx2/inc/sfx2/sidebar/ControlFactory.hxx
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
sfx2/inc/sfx2/sidebar/EnumContext.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.cxx
Change-Id: Ifa1947c9e9bfdc3635dbb5b0c7a79f8ead613a90
commit 09527de17afdd4c62e8c3a4eadd83f6e935f212b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 14 20:57:53 2013 +0100
getProcessServiceFactory->getProcessComponentContext
Change-Id: I2c4c44cb5758ef8fa2d83e0488fba65a390c466f
commit fbdb6f401ea858a02b31b99189d52238dec06db0
Author: Andre Fischer <af at apache.org>
Date: Fri May 10 11:30:31 2013 +0000
Related: #i122218# Replaced local tool box controller...
with existing GenericToolboxController (cleanup)
(cherry picked from commit 784ed0d2e9cc2de7e3de8420d4708ee5c4631a5c)
Conflicts:
svx/source/sidebar/insert/SimpleToolBoxController.cxx
svx/source/sidebar/insert/SimpleToolBoxController.hxx
Change-Id: I9c409c2979982ccd5d7a76c10db6c3f7dd59c307
commit 0153f44d7f8e45c668448f60ff51324b0f7a1eb4
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue May 14 13:37:28 2013 +0000
correct context switch handling in paragraph property panel...
and position and size property panel
(cherry picked from commit de52e4d0e544f6a6c2ab51631870d682885c30cd)
Change-Id: I9330bcb21103da65b00251786340076c8b1a4346
commit 938eb0f54b98eb53db8240591d1b57472e9d005d
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue May 14 13:21:45 2013 +0000
Resolves: #i122056# adding another Writer variant for sidebar context handling
Patch by: Ariel
Review by: Oliver
(cherry picked from commit 4a87b75b86e4c932b5230cb7caecf6f00e40a096)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: I51cd1d63ddd23a0907f1781c46891b6f5c9870c5
commit 2641ab9708c9e106856cbdeb9e13ed9b2b42382b
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue May 14 12:10:04 2013 +0000
Resolves: #i122270# paragraph property panel, line spacing control
do not directly select item via cursor travelling; removing obsolete code
(cherry picked from commit 6ca31d904b343c76899dfa2bfef3e7d20db23364)
Conflicts:
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
Change-Id: I8b8ff06008dc0fdfc617f83a4a9c0f9569a8bd36
commit a90080844935ec14e80ff0bbb39649a8b069aa91
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 15:25:51 2013 +0000
Resolves: #i121981# Don't change sidebar context while in Impress table
(cherry picked from commit a97c4ca2c235a4654243cbbdf970800454b5aa56)
Change-Id: I66ece2edb436b6e9f6bff110149d6c0c2aa37c7d
commit a66bd5ed195e21307663cb66f0feed341cd493b6
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 14:41:07 2013 +0000
Resolves: #i122298# Added quick help texts to title bar buttons of sidebar...
panels and deck
(cherry picked from commit 2f18055a153f4e66ec72b0c20673032d6edeebab)
Change-Id: Ic573030d5b8a437e09a763fb0350c22ef33e151a
commit 2ce9bf2d404bd2f1f2988bf749015d070846423d
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 13:34:46 2013 +0000
Resolves: #i122275# Don't show the layout panel for master pages
(cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8)
Conflicts:
sd/source/ui/view/drviewsa.cxx
Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5
commit d26dac3de7c7070458bef9628ee8dcd210840fa1
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 11:00:09 2013 +0000
Resolves: #i122272# Select correct sidebar button...
after changing decks via menu.
(cherry picked from commit 0763a83fb20825c66d8a3ecc50327753f7508bf9)
Change-Id: Ief24fa9191848ad6004ea7c28cd28b73b7e54f9f
commit 14e07611c8f6a8f239614c439e6d8c22c5dbeb4b
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 07:41:14 2013 +0000
Related: #i122047# Remove last traces of unused toolbox controller
(cherry picked from commit ba6704b01ebc30b06485ef7f914b873201a08e85)
Change-Id: I6107fd3f840e07f546e8ae7aa8e6eb60f8b4d566
commit b1a59c6049ced5541db12092f54510150499af2b
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 07:40:20 2013 +0000
Related: #i122047# Added missing implementation of virtual destructors
(cherry picked from commit 107eb08386046f1e78dc32b21f569c6aa7352cd1)
Change-Id: Icc57d8910a390e9b608b5aa4a0fa6d8c8659208d
commit af6f61de17a2bbd90929129df41039330407a6f8
Author: Andre Fischer <af at apache.org>
Date: Fri May 10 11:03:45 2013 +0000
Resolves: #i122047# Adding virtual destructors to interfaces...
to prevent problems with older compilers
(cherry picked from commit 8f3625e6cf098c3fd5e6701b7b687a0423d78f51)
Conflicts:
sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx
Change-Id: I2bf548fd7ff16db58938273bc4b60ad83325b376
commit 7fe348475ae2bd5e2f7cfa03e7ffb930af2af495
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 11 16:59:53 2013 +0100
valgrind: Conditional jump or move depends on uninitialised value
Change-Id: I9bfa7274befb34b67ac3c322eda805e78b3d0b8d
commit e3cff94457af1bfa62fd090292d1dc25287b6deb
Author: Andre Fischer <af at apache.org>
Date: Fri May 10 08:51:15 2013 +0000
Related: #i122082# Disable controls of text property sidebar...
panel for disabled document parts
(cherry picked from commit ffcc8c326640dfbc6b765cd25875adf9e0ab66ad)
Conflicts:
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
svx/source/sidebar/text/TextPropertyPanel.cxx
Change-Id: I9f38c71c6415f3d255b5607a67a110bca47358b0
Related: #i122082# Remove temporary change
(cherry picked from commit f213ea43fac43326a643f30ff13abd9d77f6aed7)
Change-Id: I157542fd5dbbda17b63900be9a41782ee581309c
commit ad8071dedc4d03505c6408bd080e1e3a512522c3
Author: Andre Fischer <af at apache.org>
Date: Wed May 8 12:35:53 2013 +0000
Resolves: #i122082# Show correct deck title and tab bar highlight...
after switching sidebar decks
(cherry picked from commit f44ca372a2a88f996366e5cb44842ef79dd9df6e)
Change-Id: I2162b2eafb8bd1fc8c803a398b475cdf71b6c34d
commit 8781d5f1adf349f02af7d981fca1196d563a9216
Author: Andre Fischer <af at apache.org>
Date: Wed May 8 12:01:43 2013 +0000
Related: #i122251# Avoid compiler warning
(cherry picked from commit 4a84ca3c6515bddb02a789d9386b6c6e74b037dc)
Change-Id: I24bac356682aff5905010485eac833037f585764
commit ea264aea0a3fc715e71952740a1a98f7038b80a3
Author: Andre Fischer <af at apache.org>
Date: Wed May 8 11:57:24 2013 +0000
Resolves: #i122251# Prevent key events from being forwarded...
from sidebar tab bar to Calc
(cherry picked from commit 2abab958f237c62abbd59b46b36354db60f23009)
Change-Id: Ie47d086699986b64cbdc15df649adea705351307
commit 20fdf6c8582bb00c8dce9f19f4259d3fa1efe1c6
Author: Andre Fischer <af at apache.org>
Date: Wed May 8 09:48:36 2013 +0000
Resolves: #i122255# Store sidebar panel extension state
(non persistent)
(cherry picked from commit f6f8c047b73f8fc8b4c78b321761a26ef7ed96ba)
Change-Id: I917050dd57b3fa952200dd536b371f902661e88f
commit be161e43bf7d9c1e5c5fd3cbc628da77bccd3ad8
Author: Andre Fischer <af at apache.org>
Date: Wed May 8 07:21:37 2013 +0000
Resolves: #i122254# Process mouse wheel events over sidebar scroll bar
(cherry picked from commit db9602cbf627e1a7af56f3a419ec7c7445dcfb85)
Change-Id: I272763eb24e58443d8c8a980eca9b0f654a9e899
commit d61280ac44f99c3f84db8dd027e7de6d9d954472
Author: Andre Fischer <af at apache.org>
Date: Tue May 7 11:33:50 2013 +0000
Resolves: #i122230# Fixes for sidebar focus traveling
(cherry picked from commit 2b1bd27c95821000241b6f038b62b009ab94bda7)
Change-Id: Id54bb7367d736629a43869c58d6d840fc8fd7da8
commit a2eaf56222e2c6f8bbce389ce8cf0683e8ed89b5
Author: Andre Fischer <af at apache.org>
Date: Mon May 6 13:12:20 2013 +0000
Resolves: #i122230# Fixed focus traveling in the sidebar
(cherry picked from commit bab3ddce4b3d5330835494f54b68406335821b76)
Conflicts:
sfx2/source/sidebar/FocusManager.cxx
Change-Id: I8853a92da3c4fe41a0110c630cc6af556ffc2ce4
commit 236602c651978491b7c64bb72f05601efd79a868
Author: Andre Fischer <af at apache.org>
Date: Mon May 6 08:40:39 2013 +0000
Resolves: #i122049# Changed text of 'empty' panel
(cherry picked from commit 1f317e0580d267b3cc6b6b410bc3d14a4e70e1fe)
Change-Id: I348ea9c84db10268d964e788ed5622123a9fa405
commit 453559d175fb1d96d0090c3188b6d68f5d839f73
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Sun May 5 18:51:49 2013 +0000
Initialize variable to prevent compiler warning
(cherry picked from commit 4fba97b33858a6fc610b5540ab0277370e4147bf)
Change-Id: I470036762114017a971a35aba2c7f0f41f482fa8
commit ebf7cfd24aac35271cd84e2baeb6aafb41d16777
Author: Andre Fischer <af at apache.org>
Date: Fri May 3 13:01:13 2013 +0000
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
commit 728efc1faf262a40b846f1889f196048841356b6
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri May 3 09:56:38 2013 +0000
Related: #i122140# add 'None' entry to underline style...
drop-down-list in text property panel
(cherry picked from commit 3c4045722f20bddddef9143c4f393e6f251f6d2d)
Change-Id: Ieffbd19318742dd133fce1b96d7cad2d7c457975
commit aedcc869ab9897cefd9ad3684ae9949f8466742f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 10 12:31:28 2013 +0100
remove exec bits from new pngs
Change-Id: If13f6a2dec9722dac40323e3ee68e1276c4e0e58
commit 1b87bb0f3f83710f921a1d16e4ae690190eefccc
Author: Armin Le Grand <alg at apache.org>
Date: Fri May 3 09:01:43 2013 +0000
Related: #ii122198# added ColorValueSetColumnCount entry to configuration
default is 12
(cherry picked from commit dc9abefa2d01377b14bef15463e360d9a7e9bdc2)
Conflicts:
officecfg/registry/schema/org/openoffice/Office/Common.xcs
svtools/inc/svtools/accessibilityoptions.hxx
svtools/source/inc/configitems/accessibilityoptions_const.hxx
Change-Id: Ic035b34bbcde426fa8fb76df16f84786908e18fa
commit e1ecc61267d284ce99f4c2198a225b4831c332e9
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri May 3 08:53:37 2013 +0000
Resolves: #i122079# activate missing slot invalidation...
for the cell alignment sidebar panel
(cherry picked from commit 3b31f1c781d367cfebdb388c17b22640d7e82539)
Change-Id: I3b1ee724ca14e9938302759ef6249a0f3ddd5fa7
commit 2800d3b2260f04b4fa2732dc38bf344615edfebe
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu May 2 13:50:45 2013 +0000
Resolves: #i122105# text property panel, underline style control
correct application of chosen underline style in Calc cells and Drawing objects
in Writer
(cherry picked from commit fd23db16149eb517de9b2b403ff28ed0d31c83d6)
Change-Id: Id77299c173eef99ea2eea0c0896e9bfd0bd9d1eb
commit 25506d122ed0c17f049ec8edfd2301fd0a8327de
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue Apr 30 13:04:43 2013 +0000
Resolves: #i122182# TextPropertyPanel
- add missing <break> in handling click to character attribute controls
- remove superfluous code and comments
- adapt code formatting
(cherry picked from commit a1111d73afe974a9d466a2b1678bfe5ddb5e7f34)
Conflicts:
svx/source/sidebar/text/TextUnderlineControl.cxx
Change-Id: I1aea184523f74dda78218a631a64ea192765e9d5
commit 04920f2b18c8c41c59ee000b8a0374f31a6a3526
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 30 11:52:08 2013 +0000
Related: #i122131# Fixed typo in cmd name for cell appearance 'more' dialog
(cherry picked from commit d465ec90c0626857a9c30523daba63d7b713f9e6)
Change-Id: Icb5389074faf5cf7d1b03f1203f0036f2eccb73a
commit 72609a841e1f2e2faaae18e7d7cb31a62fc7b5b8
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 30 11:36:12 2013 +0000
Related: #i122056# Added another Writer variant to sidebar...
context handling.
(cherry picked from commit 542f0ff097c0e3eb71a1ad19f6d46a9860e754d9)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: Ib88f75d3dfdba5c14c2d3c747e90eecd00e6f249
commit 11305adaebf3f5a3cf761b6b003acd07f6fdfa6c
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 30 09:57:28 2013 +0000
Related: #i122144# Color mode control now looks like in toolbar
and fixed overlapping icons and metric fields.
(cherry picked from commit 835892332e2fda9e2082668679fb0385bf37eaaf)
Change-Id: I21a78328bf11f7368ba97fc47b72f247e7316706
commit 9ac3c6376725e0e64afbdce822cffdfad9e2d2a7
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Mon Apr 29 11:30:03 2013 +0000
Related: #i122156# #i122087# correct context notification...
regarding the text edit mode for Drawing objects - take two
(cherry picked from commit 3dd1e0f85ba7d0fdcb2de134184407201ca7fae0)
Conflicts:
sc/source/ui/inc/drawview.hxx
sc/source/ui/view/drawview.cxx
Change-Id: Icfe16b76fc4fcc838133d8410736877703e5c23b
commit 08aaf3b5730c88fec1a989c345f88e20e6e49f89
Author: Andre Fischer <af at apache.org>
Date: Mon Apr 29 10:43:22 2013 +0000
Related: #i122157# Added sidebar menu entry to more writer variants
(cherry picked from commit bbd95678a1ba46a715243c563c6a4a86bfa5ad91)
Change-Id: Iea83e8778b293fc78e3aa7a0bd34e940e54755d7
commit d292d15cbe0035705e1044df86b00b24069de3bd
Author: Andre Fischer <af at apache.org>
Date: Mon Apr 29 08:34:09 2013 +0000
Resolved: #i122186# Rearranged controls in text property panel...
to make font selection box wider.
(cherry picked from commit 4484a62e0365fc36cc2a9e3ad1c71749d260d4d0)
Change-Id: I4a189c106b497da36e3ad0d13a8e6087b95e73c2
commit 02547e2eba7e9769267b616256bca964ed9d33e7
Author: Andre Fischer <af at apache.org>
Date: Mon Apr 29 07:44:43 2013 +0000
Resolves: #i122082# Hide sidebar panels for read only documents
(cherry picked from commit aae247a34cd6f3bf421e57bbec08837d73ddf258)
Conflicts:
sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
sfx2/inc/sfx2/sidebar/Theme.hxx
sfx2/source/sidebar/SidebarChildWindow.cxx
sfx2/source/sidebar/SidebarController.cxx
sfx2/source/sidebar/SidebarDockingWindow.cxx
Change-Id: Ib59132d6d5e177d5a02ee24973b0fb07114db60a
commit 73420e614fcd7153aea1894a456b054e9614cf5b
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri Apr 26 11:20:19 2013 +0000
Related: #i122156# #i122087# correct context notification...
regarding the text edit mode for Drawing objects
(cherry picked from commit a0e76afb572510e2c2c75fc6c558f271c0d74d0b)
Change-Id: I8b4e5cbd865455ef3d7046f9d65c5dd68a53d8ce
commit 894964693fcde9feaa90743d7e7e0a150fd7e441
Author: Andre Fischer <af at apache.org>
Date: Fri Apr 26 11:20:08 2013 +0000
Related: #i122144# Replace more Symphony icons with standard icons
ParaPropertyPanel
(cherry picked from commit 8808ad841fd74a482c8b0f192c1a3a936f12dcfc)
Conflicts:
icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
icon-themes/galaxy/svx/res/symphony/para_vert01.png
icon-themes/galaxy/svx/res/symphony/para_vert02.png
icon-themes/galaxy/svx/res/symphony/para_vert03.png
icon-themes/galaxy/svx/res/symphony/para_verth01.png
icon-themes/galaxy/svx/res/symphony/para_verth02.png
icon-themes/galaxy/svx/res/symphony/para_verth03.png
icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png
Change-Id: Idedcbb16b99a0fa7126d4e095e13e4f3a1f3f013
Fix build breaker: declare missing member variable
(cherry picked from commit eb15aa364708f091c4c59a66f9c3f43e35dafd31)
Change-Id: Ie53ff7cea8874048fe575003a0ae4ded25b6535b
Fix build breaker: remove missing images
(cherry picked from commit 2f116e91d1960503589ce10b726a5383dead800f)
Change-Id: I6130c7b55b03b3962ec72f49d48084324dfdc3df
commit 8de44977ba0595e609ce108e0d65031cd8dc3602
Author: Andre Fischer <af at apache.org>
Date: Fri Apr 26 07:37:47 2013 +0000
Related: #i122144# Use standard icons for sidebar number formats
(cherry picked from commit 7a309ee2def4ece46f78371ee18e94fae9fc3c05)
Conflicts:
icon-themes/galaxy/sc/res/sidebar/123.png
icon-themes/galaxy/sc/res/sidebar/ABC.png
icon-themes/galaxy/sc/res/sidebar/canlendar.png
icon-themes/galaxy/sc/res/sidebar/money.png
icon-themes/galaxy/sc/res/sidebar/percent.png
Change-Id: I69c6c9b6f6cf887332186b68ca4b9e8775575855
commit 0f1fb1b44ced31125ad102b62744e61db52e458e
Author: Andre Fischer <af at apache.org>
Date: Fri Apr 26 06:45:40 2013 +0000
Related: #i122144# Use same color for all sidebar backgrounds
(cherry picked from commit ae86d3036171e63bfe193e678c9c05a1ec1a12bb)
Change-Id: I4879d515f45f74b25e0319d3244c5722a449c7ed
commit 3b170e426e4180ecafdf949dff27d3e8e7032c5b
Author: Zheng Fan <zhengfan at apache.org>
Date: Fri Apr 26 01:22:59 2013 +0000
Resolves: #ii122166# refine icons of numbering and bullets toolbox...
inside sidebar for consistency
(cherry picked from commit 6818706a832b4f6281cdf31d274b4a72c0ff2d58)
Conflicts:
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Change-Id: Ida87df66cd35066415a83e369008a4b1e20ab171
commit b398ba0b963b2f218568919644d59b2997b3d06a
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 25 13:01:39 2013 +0000
Resolves: #i122141# introduce missing Char Font dialog Slot
for opening Character Font dialog for Text property panel in Calc
(cherry picked from commit 2ec379f0bc8af50ead792677b1f69c61d6903cf3)
Change-Id: I07e7affe744efe151c8701e096fde01a52c2d7e0
commit c6c33f3a65e965b78da4a1c9541b6d2d98d4531d
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 25 10:51:17 2013 +0000
Related: #i121420# apply context dependent Show Menu Commands...
according given panel configurations
(cherry picked from commit c4a3b967b0ba367b219ac181fe2ed24a64e3c224)
Change-Id: Ib2b3161c70112032659e712556641a46f43edcd0
commit 3b8e1152b39ad15d30dc6f1c29876a09e4c01051
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 24 14:24:02 2013 +0000
Resolves: #i122074# paragraph property panel
correct enable/disable of indentation increase/decrease controls
(cherry picked from commit cc9eaeaaa2ab279db0bf9a8fa63034333dbdaae3)
Change-Id: Ia7c676435859027f0526d6253db771e2359bb7cc
commit ea70c237e0d63efc3b91de4e5f70d647ba8a33fe
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 24 14:18:22 2013 +0000
Related: #i122121# moved automatic StartEnd adaption to svx
(cherry picked from commit 81e9ede3e748a40555e87efd1af19521dab5261d)
Conflicts:
sd/source/ui/view/drviews2.cxx
Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2
commit 08bd372c1c2e8afadde476a8d399cba9284fb8ae
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 24 12:03:20 2013 +0000
Related: #ii122121# Adapted ScDrawShell::GetDrawAttrState
(cherry picked from commit 8120312665d94223a1e506fb6f46d2e0e9bc30ad)
Conflicts:
sc/source/ui/drawfunc/drawsh2.cxx
Change-Id: I19b1b7e83f16b618ecac95f000c15a60288ce5ae
commit d8b5e4e09810eb7215669b9b5f81a166a63b8c62
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 24 09:50:54 2013 +0000
Related: #i122111# Adapted pState usages in NotifyItemUpdate methods
adapted control positioning in PosSizePanel
(cherry picked from commit 76e55d0f6effee49090d1e931c372671ec184123)
Conflicts:
svx/source/sidebar/area/AreaPropertyPanel.cxx
svx/source/sidebar/area/AreaPropertyPanel.hxx
Change-Id: I5762c5208259ca071decebcc937bfaab8e0464b2
commit f249f96ca2ff0649ad5772f7cd708b2c45f810d7
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 24 09:21:09 2013 +0000
Resolves: #i122067# show correct state in paragraph property panel
i.e. the paragraph property panel's bullet and numbering popup control
(cherry picked from commit 167f05365100f6c9bcbd17045e4feeea3cd120d9)
Conflicts:
svx/source/sidebar/paragraph/ParaBulletsControl.cxx
svx/source/sidebar/paragraph/ParaNumberingControl.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
Change-Id: Iacea3f063d1050f873cff443fb3e1df4b8983279
commit 088d55b583ed5598e89dfe8a8e4bc469d2d5e155
Author: Andre Fischer <af at apache.org>
Date: Wed Apr 24 07:35:03 2013 +0000
Resolves: #i122093# Don't show Impress layouts panel for master pages
(cherry picked from commit 573490c7240fc02dcf82bf0ba262863612e53187)
Conflicts:
sd/source/ui/sidebar/LayoutMenu.cxx
Change-Id: Ie5c0a1e15ea8db2d2b033efb1234492bd438658d
Related: #i122093# WaE in DrawController::BroadcastContextChenge()
(cherry picked from commit 26e4fcdbb8594696b45d0600e1b7a5e5946cd2aa)
Change-Id: I416215077643f3eb4d43eb761e457d0893bcc429
commit 8135dd799331d4b9fd8c54beb5a8a2392037e72a
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 14:08:04 2013 +0000
Resolves: #i122086# Show icons in decks and titles (optionally)
(cherry picked from commit 80b53edb04ed2d4b4f27f8256b754593902f0c23)
Change-Id: Ic9aafce182b96aa44956d9ddbf165f4cc736e41b
commit 688343013927f957ecb06f1a63c1fea9ffea4727
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue Apr 23 13:56:58 2013 +0000
Related: #i121793# correction for page property panel:
- show correct state in popups
- aggregate multiple attribute changes into one undo action
(cherry picked from commit 306b1c56dc88ac357093d1dc5eb8c8360f8f7100)
Conflicts:
sw/source/ui/sidebar/PagePropertyPanel.cxx
sw/source/ui/uiview/viewtab.cxx
Change-Id: I4764be46535fe7a00cbb296c06094e3f8ea461df
commit 83364fe927254bcababd696ff352e1e112e890c7
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 12:56:35 2013 +0000
Resolves: #i122085# Fixed over-painting of fixed text
(cherry picked from commit 0ba322a27a8d0651f410741d79bbb7125a8ec2b7)
Change-Id: I208297d67bdb9e0277b39c0dc78b777f5eb2a7fa
commit 8ae88ffcf0da39e333e047cadc3a7fb51d22a6e5
Author: Armin Le Grand <alg at apache.org>
Date: Tue Apr 23 12:53:29 2013 +0000
Resolves: #ii122111# Corrected LinePropertyPanel::NotifyItemUpdate
to use pState with more care
(cherry picked from commit 12df8f6dd3ed9ea37d9d0dd61bc56ada3bc062b1)
Conflicts:
svx/source/sidebar/line/LinePropertyPanel.cxx
Change-Id: I380a4f9f8e43340ee03a1cd10546367b6818f74e
commit 23ead4ad094bd36a693f932940d6ea99160cb2d3
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 12:49:57 2013 +0000
Related: #i122144# Paint titles of sidebar decks and titles bold
(cherry picked from commit 4b7c52c48793d005d3bd618b025b890ff94e7774)
Change-Id: I5e8ad1db7a962f002beb1b976d85a29bfcb5403f
commit 033fdda2a3cfbd282e0f2d5fb34738fb913b97c9
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 12:20:01 2013 +0000
Related: #i121960# Fixed typo that made the superscript button...
look like the subscript button.
(cherry picked from commit eac056c47b2bf233ff36436136463cb3f3eb9e23)
Change-Id: I1ba1a609954cd88aa38f76c8e329f35152951ae5
commit ba2a893b0b903449e7b9b24522b9a5e53bbd65d0
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 11:33:28 2013 +0000
Related: #i122051# Sidebar handles more Writer variants.
(cherry picked from commit dc36f82362dc1fb159668937cde7cedbc3fad503)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: I230b6dd3a68d2a17d0433f7919e74f1fcfae8d01
commit d0bcc3293b058bc840452d089db91d85cb98b04f
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 10:41:58 2013 +0000
Related: #i122144#: Use AOO icons for flipping shapes.
(cherry picked from commit 52450684d9c02f0d6d96bff731c348d85ca4ced1)
Conflicts:
icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png
icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png
Change-Id: I99e3d3b9e7046ee0de60075f49dc47f086e17dcc
commit 45b707b0f0f39272b4ca5d747b4bd61b71b9df0c
Author: Armin Le Grand <alg at apache.org>
Date: Mon Apr 22 15:38:05 2013 +0000
Related: #i122041# More unifications for FillStyles
better defaults and better preview visualizations
(cherry picked from commit 35c9acfc98fc98399005815e0464b1944f327d4e)
Conflicts:
officecfg/registry/schema/org/openoffice/Office/Common.xcs
svtools/inc/svtools/accessibilityoptions.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/config/accessibilityoptions.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/valueset.cxx
svtools/source/inc/configitems/accessibilityoptions_const.hxx
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/xtable.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/tbxctrls/SvxColorValueSet.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtable.cxx
vcl/inc/ilstbox.hxx
vcl/inc/vcl/combobox.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/settings.hxx
vcl/source/app/settings.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/lstbox.cxx
Change-Id: I905b6814cb796a35aa23fedb9ce716f77e2bfda0
commit 804e7b4fe2116d3506bb0b5012038a553446032e
Author: Andre Fischer <af at apache.org>
Date: Mon Apr 22 15:01:51 2013 +0000
Resolves: #i122095# React asynchronously to context changes
In order to avoid problems in SFX2
(cherry picked from commit 61ed9eac0583e34a9b69f0a1adcc208509e336a1)
Change-Id: I375603a28e788ce9257be308dc09a589240d0e58
commit 2980b8655ec3171044ffacd50bb5c96e037af529
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Apr 19 16:35:12 2013 +0000
minor change in syntax to make localize happy
(cherry picked from commit e271ee33bd29cb8e5a7bbecdcdac71596ee2442f)
Change-Id: I2079c019575c32bca0323515e51ec166c36ef94e
commit 29ececc8e66094f639a0e6f1ee96bc5e6226446b
Author: Andre Fischer <af at apache.org>
Date: Fri Apr 19 14:27:16 2013 +0000
Resolves: #i122104# Fixed selection of sidebar button.
(cherry picked from commit 8d956f9ec332f818fbe49286ba8eec28179486f2)
Change-Id: If87b0dd13d1d333212d41f0a1e1122e4ef6c5ab2
commit 8e7bd0570ab32f29e7d30f9d85df0a20571c6ec2
Author: Andre Fischer <af at apache.org>
Date: Fri Apr 19 08:51:45 2013 +0000
Resolves: #i121960# Extend the sidebar::ControllerItem to check Disabled state
Converted TextPropertyPanel to use this new functionality.
(cherry picked from commit 5e32abe48b0833e4e370507a1e74fbb1ba98b5e3)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
sfx2/source/sidebar/ControllerItem.cxx
sfx2/source/sidebar/FocusManager.cxx
sfx2/source/sidebar/SidebarChildWindow.cxx
svx/Library_svx.mk
svx/source/sidebar/text/TextPropertyPanel.cxx
svx/source/sidebar/text/TextPropertyPanel.hrc
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.src
svx/source/sidebar/text/TextUnderlineControl.hxx
Change-Id: I3a25bb0a02e6165ceeb6dbd9e6ecd3e94051f594
commit e74198d198208ba559a80eb0668b01603ea125a4
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 18 11:16:00 2013 +0000
Resolves: #i122026# adjust names of newly introduced UNO commands
correct uno:FlipHorizontal and uno:FlipVertical
(cherry picked from commit 1ea8067f70bb806aa501ea72686a950f1e5ee591)
Conflicts:
default_images/res/commandimagelist/lc_fliphorizontal.png
default_images/res/commandimagelist/lc_flipvertical.png
default_images/res/commandimagelist/lch_fliphorizontal.png
default_images/res/commandimagelist/lch_flipvertical.png
default_images/res/commandimagelist/sc_fliphorizontal.png
default_images/res/commandimagelist/sc_flipvertical.png
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
svx/sdi/svx.sdi
sw/inc/cmdid.h
sw/source/ui/shells/drawsh.cxx
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
sw/uiconfig/swform/toolbar/graphicobjectbar.xml
sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
Change-Id: I2c646586d592eb1d703c6db07e4c913d858fdc47
commit 24fe8f81501af790d8fad2007c00e3b12be326e4
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 14:33:38 2013 +0000
Related: #i122072# map SID_ATTR_LINE_START and SID_ATTR_LINE_END...
...to the correct GetState method GetDrawAttrState
(cherry picked from commit 6c248d4f4f3a6e432e140900e5735e249e27dd01)
Change-Id: I08636bf35dbcacf2b34fca94be3f8867e2092981
commit e37533d835d6d62c20ddae5ac6bf84ddff51e8ec
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 14:15:54 2013 +0000
Related: #i122072# map SID_ATTR_LINE_START and SID_ATTR_LINE_END...
...to the correct GetState method GetDrawAttrState
(cherry picked from commit e9b32f693643ae28d60922e344d908082f15c510)
Change-Id: Ibb94a6297536d65e6f50e692306b38f7d6feb74b
commit c389043a5fa22b161ebaf3ef02e234d8b90c8541
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 12:15:11 2013 +0000
Related: #i122041# Added 'Automatic' to TextPropertyPanel, FontColor...
and HilightColor. Added 'No Color' to ParagraphPropertyPanel and
BackgroundColor
(cherry picked from commit 6b722f7d7c1ae5a1b344a24442bd591afba8606b)
Conflicts:
svx/inc/svx/dialogs.hrc
Change-Id: If75bdb87a1fc43e753c8c8ab15370808235926fd
commit fc7000e9116c8694f166b0e783648864ababe49e
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 17 11:50:36 2013 +0000
Resolves: #i122025# UNO commands introduced with sidebar
apply labels and disable their UI customization
(cherry picked from commit 339494cf948e22dcb089c0d921dfb396d9233cb8)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
svx/inc/svx/svxids.hrc
svx/sdi/svx.sdi
sw/sdi/swriter.sdi
Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb
Related: #i122025# followup - remove usage of removed Slot
(cherry picked from commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac)
Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf
commit d3246420c72a2fbb9ab6b608893ad83067fd847c
Author: Zheng Fan <zhengfan at apache.org>
Date: Mon Apr 22 04:20:08 2013 +0000
Resolves: #i122118# changed for incorrect tips for bullets drop down
(cherry picked from commit 947c734dfcb6fe78c9838f9c88bf89b186a424de)
Conflicts:
svx/source/sidebar/paragraph/ParaPropertyPanel.src
Change-Id: I3e5a5650264d280206f57c8b8ff146c696b2a88d
commit 8230567dd48d9c5bd6e08d142fad215f6c0720ca
Author: Zheng Fan <zhengfan at apache.org>
Date: Mon Apr 22 04:17:31 2013 +0000
Resolves: #i122054# for change the drop down list issue
(cherry picked from commit 07c075acd60e93962c785d066c84f2a80a47e958)
Change-Id: Ide6bdd5177298a345bed90af68a24e0edcda1cd1
commit ccdf4fa5ea8e8caa4bab194ebcfd80cd03b55f1a
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 10:51:39 2013 +0000
Related: #i122042# corrected adding default values in LineStyleListBox
(cherry picked from commit 246d57106712df34b05c2522c145d244df2d31eb)
Conflicts:
cui/source/tabpages/tplnedef.cxx
Change-Id: I6fde45b3e5a5d0a25a549ea03ec50302c8541195
commit 77f8e887c34b2dcd9a45d00cedf4ea0627f59c74
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 10:51:23 2013 +0000
Resolves: #i122042# corrected adding default values in LineStyleListBox
(cherry picked from commit 33242bbc8350f2b253fae2d4261561796d848455)
Conflicts:
svx/inc/svx/dlgctrl.hxx
svx/source/dialog/dlgctrl.cxx
Change-Id: I4391164c0dbdd99c64fe7eca1bdd10cd92e32128
commit 10a95438aaa4ad8e37c8a64ccb719a9beab40700
Author: Armin Le Grand <alg at apache.org>
Date: Tue Apr 16 16:09:17 2013 +0000
Related: #i122041# Adapted the descriptions in Common.xcs slightly
(cherry picked from commit df8441aab1ea0d6df5619f2c7403a65dfacad125)
Conflicts:
officecfg/registry/schema/org/openoffice/Office/Common.xcs
Change-Id: Ia107a029b431d54739fc5524c6978bb53b53a785
commit c1ac81851bace5409174f4dbe986a6bf506aa8ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 4 20:45:39 2013 +0100
adjust .ui widgets for centralized Color ValueSets
Change-Id: Ie6b86a2a48e6697f816e9975b6e34491ab0ad17e
commit 9514d833ca8426eb05a563ac1f20b8f2a9985d27
Author: Armin Le Grand <alg at apache.org>
Date: Tue Apr 16 08:41:07 2013 +0000
Resolves: #i122041# Unified and centralized control for Color ValueSets
(cherry picked from commit 68e707bbc6fe23881b822e6efab8a2933343dc1a)
Conflicts:
cui/source/inc/backgrnd.hxx
cui/source/inc/cuitabarea.hxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/tpcolor.cxx
sd/source/ui/view/drviews6.cxx
svx/Package_inc.mk
svx/inc/svx/colrctrl.hxx
svx/source/sidebar/tools/ColorControl.cxx
svx/source/tbxctrls/colorwindow.hxx
svx/source/tbxctrls/colrctrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
Change-Id: Ie06fe355846b737ec8aae9aade4d408232c83193
Related: #i122041# Add a11y values for defining behaviour of ColorValueSets
(cherry picked from commit 401e8f2db607081e62eaaa1f08a8cd8971a3f637)
Conflicts:
cui/source/tabpages/backgrnd.cxx
officecfg/registry/schema/org/openoffice/Office/Common.xcs
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
svtools/inc/svtools/accessibilityoptions.hxx
svtools/source/inc/configitems/accessibilityoptions_const.hxx
vcl/inc/vcl/bitmap.hxx
vcl/source/gdi/bitmap4.cxx
Change-Id: If9d0db5f22974cad1ac886eca3719ca92ca7f240
commit 404dcca3d9a01a950f1a5c1042a148f871167b02
Author: Armin Le Grand <alg at apache.org>
Date: Thu Apr 11 13:11:46 2013 +0000
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit f8f9cb1148f70f61f486517a1f353c4a3de8211f)
Conflicts:
svx/inc/svx/xtable.hxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.hrc
svx/source/sidebar/line/LinePropertyPanel.src
Change-Id: Ie49b28503e092c6685fb02c00820d4a3eaa3abb6
commit 51d3c22ed09aec77e7f068fdb7560c082c821ee0
Author: Armin Le Grand <alg at apache.org>
Date: Thu Apr 11 13:08:22 2013 +0000
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit f45335265ec5597510bf7a17cf521906c0288b9d)
Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9
commit 85cdd0b09698377a9ac288ee49077598d68aa2a3
Author: Armin Le Grand <alg at apache.org>
Date: Thu Apr 11 13:08:10 2013 +0000
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit ef75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2)
Conflicts:
icon-themes/galaxy/svx/res/symphony/style_line1.png
icon-themes/galaxy/svx/res/symphony/style_line10.png
icon-themes/galaxy/svx/res/symphony/style_line11.png
icon-themes/galaxy/svx/res/symphony/style_line2.png
icon-themes/galaxy/svx/res/symphony/style_line3.png
icon-themes/galaxy/svx/res/symphony/style_line4.png
icon-themes/galaxy/svx/res/symphony/style_line5.png
icon-themes/galaxy/svx/res/symphony/style_line6.png
icon-themes/galaxy/svx/res/symphony/style_line7.png
icon-themes/galaxy/svx/res/symphony/style_line8.png
icon-themes/galaxy/svx/res/symphony/style_line9.png
icon-themes/hicontrast/svx/res/symphony/style_line1.png
icon-themes/hicontrast/svx/res/symphony/style_line10.png
icon-themes/hicontrast/svx/res/symphony/style_line11.png
icon-themes/hicontrast/svx/res/symphony/style_line2.png
icon-themes/hicontrast/svx/res/symphony/style_line3.png
icon-themes/hicontrast/svx/res/symphony/style_line4.png
icon-themes/hicontrast/svx/res/symphony/style_line5.png
icon-themes/hicontrast/svx/res/symphony/style_line6.png
icon-themes/hicontrast/svx/res/symphony/style_line7.png
icon-themes/hicontrast/svx/res/symphony/style_line8.png
icon-themes/hicontrast/svx/res/symphony/style_line9.png
Change-Id: Iccb0c2b6b1870806d05ee02569b7fdf1f96405c2
commit 8a8bd7bca0bd1e7001ad2be33b46262801779bbc
Author: Andre Fischer <af at apache.org>
Date: Thu Apr 11 12:29:52 2013 +0000
Resolves: #i122027# Fixed crash when processing .uno:NumberType command
Reported by: Ariel Constenla-Haile
Patch by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 6a56f5db1d478297aedd3395a882fc2dcce80e82)
Change-Id: Idbcb46b617fc2d2e2d587cdd74226380a2019303
commit eb00c4485c2dc36782da26ec159b83bb70cfd1f8
Author: Andre Fischer <af at apache.org>
Date: Thu Apr 11 12:20:30 2013 +0000
Resolves: #i122028# Fixed crash when processing .uno:SwPageColumn
Reported by: Ariel Constenla-Haile
Patch by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 717671a6ec6eab7d87fe7236bb792569151e6b08)
Conflicts:
sw/source/ui/uiview/viewtab.cxx
Change-Id: I127db2160c16789f672b5520a77e27d1f6dac719
commit 9ae02bb04ba9db5366b2674648f5422cf4e97e23
Author: Andre Fischer <af at apache.org>
Date: Thu Apr 11 12:10:36 2013 +0000
Resolves: #i122030# Fixed bug in documentation that breaks autodoc processing
Found and patched by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 2784b2266ba8ce1dcd899a06626669dfd4dadde5)
Change-Id: I5fafe38f007a9a98b34e3fc99950bdb8e4c79278
commit 0b208c36661c065ac5c9c23d39567974d5f326c9
Author: Andre Fischer <af at apache.org>
Date: Thu Apr 11 12:04:57 2013 +0000
Related: #i121420# Provide sidebar panels with XCanvas objects.
(cherry picked from commit d179a612f5f9c01776ea52bfdcf27f1cb864f249)
Conflicts:
sfx2/source/sidebar/SidebarController.cxx
Change-Id: I755d55ac0f5a97fdd11476ce11631afb362e83d8
commit 0211dbcbe41d8d41b7dfa980bfb1106f2ffbcabe
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 10 08:20:16 2013 +0000
Resolves: #i121420# merge sidebar feature
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5)
Conflicts:
chart2/source/controller/dialogs/dlg_View3D.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
chart2/source/controller/inc/ViewElementListProvider.hxx
chart2/source/controller/inc/dlg_View3D.hxx
chart2/source/controller/main/ShapeController.cxx
chart2/source/inc/chartview/DrawModelWrapper.hxx
chart2/source/view/main/DrawModelWrapper.cxx
cui/source/inc/border.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/sdrcelldlg.hxx
cui/source/inc/treeopt.hxx
cui/source/options/optchart.cxx
cui/source/options/optchart.hxx
cui/source/options/optcolor.cxx
cui/source/options/treeopt.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tplneend.cxx
editeng/inc/editeng/outliner.hxx
extensions/source/propctrlr/standardcontrol.cxx
framework/source/register/registerservices.cxx
offapi/com/sun/star/ui/makefile.mk
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
postprocess/packregistry/makefile.mk
reportdesign/source/ui/dlg/Condition.cxx
reportdesign/source/ui/misc/UITools.cxx
sc/inc/document.hxx
sc/inc/helpids.h
sc/inc/sc.hrc
sc/prj/build.lst
sc/sdi/scalc.sdi
sc/source/core/data/documen9.cxx
sc/source/core/data/drwlayer.cxx
sc/source/ui/app/scdll.cxx
sc/source/ui/app/typemap.cxx
sc/source/ui/dbgui/scendlg.cxx
sc/source/ui/docshell/docsh2.cxx
sc/source/ui/docshell/docsh4.cxx
sc/source/ui/drawfunc/chartsh.cxx
sc/source/ui/drawfunc/drawsh.cxx
sc/source/ui/drawfunc/drawsh2.cxx
sc/source/ui/drawfunc/drawsh4.cxx
sc/source/ui/drawfunc/drformsh.cxx
sc/source/ui/drawfunc/drtxtob.cxx
sc/source/ui/drawfunc/drtxtob1.cxx
sc/source/ui/drawfunc/drtxtob2.cxx
sc/source/ui/drawfunc/graphsh.cxx
sc/source/ui/drawfunc/oleobjsh.cxx
sc/source/ui/inc/chartsh.hxx
sc/source/ui/inc/formatsh.hxx
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/optdlg/opredlin.cxx
sc/source/ui/optdlg/tpview.cxx
sc/source/ui/sidebar/makefile.mk
sc/source/ui/view/auditsh.cxx
sc/source/ui/view/cellsh.cxx
sc/source/ui/view/editsh.cxx
sc/source/ui/view/formatsh.cxx
sc/source/ui/view/pivotsh.cxx
sc/source/ui/view/tabvwsh.cxx
sc/util/makefile.mk
sd/inc/sdabstdlg.hxx
sd/prj/build.lst
sd/sdi/ToolPanelViewShell.sdi
sd/sdi/makefile.mk
sd/source/ui/accessibility/makefile.mk
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/dlg/PaneChildWindows.cxx
sd/source/ui/dlg/PaneShells.cxx
sd/source/ui/dlg/copydlg.cxx
sd/source/ui/dlg/navigatr.cxx
sd/source/ui/dlg/sddlgfact.cxx
sd/source/ui/dlg/sddlgfact.hxx
sd/source/ui/docshell/docshel3.cxx
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
sd/source/ui/framework/factories/TaskPanelFactory.cxx
sd/source/ui/framework/factories/TaskPanelFactory.hxx
sd/source/ui/framework/factories/ViewShellWrapper.cxx
sd/source/ui/framework/factories/makefile.mk
sd/source/ui/framework/module/ImpressModule.cxx
sd/source/ui/framework/module/ToolPanelModule.cxx
sd/source/ui/framework/tools/FrameworkHelper.cxx
sd/source/ui/func/fuolbull.cxx
sd/source/ui/inc/DrawViewShell.hxx
sd/source/ui/inc/PaneChildWindows.hxx
sd/source/ui/inc/celltempl.hxx
sd/source/ui/inc/copydlg.hxx
sd/source/ui/inc/dlgpage.hxx
sd/source/ui/inc/framework/FrameworkHelper.hxx
sd/source/ui/inc/prltempl.hxx
sd/source/ui/inc/tabtempl.hxx
sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
sd/source/ui/inc/taskpane/PanelId.hxx
sd/source/ui/inc/tpaction.hxx
sd/source/ui/sidebar/AllMasterPagesSelector.cxx
sd/source/ui/sidebar/AllMasterPagesSelector.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/DocumentHelper.cxx
sd/source/ui/sidebar/DocumentHelper.hxx
sd/source/ui/sidebar/LayoutMenu.cxx
sd/source/ui/sidebar/LayoutMenu.hxx
sd/source/ui/sidebar/MasterPageContainer.cxx
sd/source/ui/sidebar/MasterPageContainer.hxx
sd/source/ui/sidebar/MasterPageContainerFiller.cxx
sd/source/ui/sidebar/MasterPageContainerFiller.hxx
sd/source/ui/sidebar/MasterPageContainerProviders.cxx
sd/source/ui/sidebar/MasterPageContainerProviders.hxx
sd/source/ui/sidebar/MasterPageContainerQueue.cxx
sd/source/ui/sidebar/MasterPageContainerQueue.hxx
sd/source/ui/sidebar/MasterPageDescriptor.cxx
sd/source/ui/sidebar/MasterPageDescriptor.hxx
sd/source/ui/sidebar/MasterPageObserver.cxx
sd/source/ui/sidebar/MasterPagesSelector.cxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
sd/source/ui/sidebar/PreviewValueSet.cxx
sd/source/ui/sidebar/PreviewValueSet.hxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
sd/source/ui/sidebar/SidebarShellManager.cxx
sd/source/ui/sidebar/SlideTransitionPanel.hxx
sd/source/ui/sidebar/makefile.mk
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
sd/source/ui/table/TableDesignPane.hxx
sd/source/ui/toolpanel/ControlContainer.cxx
sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
sd/source/ui/toolpanel/MethodGuard.hxx
sd/source/ui/toolpanel/ScrollPanel.cxx
sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
sd/source/ui/toolpanel/SubToolPanel.cxx
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
sd/source/ui/toolpanel/TitleBar.cxx
sd/source/ui/toolpanel/TitledControl.cxx
sd/source/ui/toolpanel/ToolPanel.cxx
sd/source/ui/toolpanel/ToolPanel.hxx
sd/source/ui/toolpanel/ToolPanelFactory.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.hxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
sd/source/ui/unoidl/UnoDocumentSettings.cxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/drviews3.cxx
sd/source/ui/view/drviews7.cxx
sd/source/ui/view/drviewsa.cxx
sd/source/ui/view/drviewsf.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/sdview.cxx
sd/source/ui/view/viewshel.cxx
sd/uiconfig/sdraw/menubar/menubar.xml
sd/util/makefile.mk
sfx2/Package_inc.mk
sfx2/inc/sfx2/sfx.hrc
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/control/bindings.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
svx/AllLangResTarget_svx.mk
svx/Package_inc.mk
svx/inc/svx/XPropertyTable.hxx
svx/inc/svx/bmpmask.hxx
svx/inc/svx/colrctrl.hxx
svx/inc/svx/dialogs.hrc
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/dlgutil.hxx
svx/inc/svx/drawitem.hxx
svx/inc/svx/fontwork.hxx
svx/inc/svx/galbrws.hxx
svx/inc/svx/sdr/table/tablecontroller.hxx
svx/inc/svx/svdmodel.hxx
svx/inc/svx/svdstr.hrc
svx/inc/svx/svxids.hrc
svx/inc/svx/svxitems.hrc
svx/inc/svx/xattr.hxx
svx/inc/svx/xflgrit.hxx
svx/inc/svx/xflhtit.hxx
svx/inc/svx/xit.hxx
svx/inc/svx/xlineit.hxx
svx/inc/svx/xlndsit.hxx
svx/inc/svx/xlnedit.hxx
svx/inc/svx/xlnstit.hxx
svx/inc/svx/xtable.hxx
svx/sdi/svx.sdi
svx/source/dialog/_bmpmask.cxx
svx/source/dialog/dialcontrol.cxx
svx/source/dialog/dlgctrl.cxx
svx/source/dialog/dlgutil.cxx
svx/source/dialog/fontwork.cxx
svx/source/gallery2/galbrws.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/gallery2/gallery1.cxx
svx/source/items/drawitem.cxx
svx/source/items/svxitems.src
svx/source/sdr/attribute/sdrformtextattribute.cxx
svx/source/sidebar/ColorPanel.hxx
svx/source/sidebar/EmptyPanel.hrc
svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/gallery/GalleryPanel.hxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdogrp.cxx
svx/source/svdraw/svdstr.src
svx/source/tbxctrls/tbcontrl.cxx
svx/source/unodraw/XPropertyTable.cxx
svx/source/unodraw/unoctabl.cxx
svx/source/xoutdev/XPropertyEntry.cxx
svx/source/xoutdev/xattr.cxx
svx/source/xoutdev/xattr2.cxx
svx/source/xoutdev/xtabbtmp.cxx
svx/source/xoutdev/xtabcolr.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtabgrdt.cxx
svx/source/xoutdev/xtabhtch.cxx
svx/source/xoutdev/xtable.cxx
svx/source/xoutdev/xtablend.cxx
svx/util/svx.component
sw/inc/cmdid.h
sw/inc/docsh.hxx
sw/inc/editsh.hxx
sw/inc/helpid.h
sw/inc/rcid.hrc
sw/inc/swabstdlg.hxx
sw/inc/swcommands.h
sw/sdi/swriter.sdi
sw/source/core/doc/docdesc.cxx
sw/source/core/draw/drawdoc.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshdrw.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docst.cxx
sw/source/ui/config/optpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/inc/tmpdlg.hxx
sw/source/ui/misc/pggrid.cxx
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/beziersh.cxx
sw/source/ui/shells/drawdlg.cxx
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drformsh.cxx
sw/source/ui/shells/drwbassh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/drwtxtsh.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/olesh.cxx
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtnum.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/uno/unofreg.cxx
sw/source/ui/utlui/navipi.cxx
sw/util/sw.component
vcl/inc/vcl/split.hxx
vcl/inc/vcl/window.hxx
vcl/inc/window.h
vcl/source/window/split.cxx
vcl/source/window/window.cxx
vcl/source/window/window4.cxx
Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e
Resolves: #i122194# Adapted license text in propertypanel.hrc
then renamed it to ResourceDefinitions.hrc
(cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b)
Conflicts:
sfx2/Package_inc.mk
sfx2/source/sidebar/SidebarChildWindow.cxx
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
sw/source/ui/sidebar/PagePropertyPanel.src
sw/source/ui/sidebar/WrapPropertyPanel.src
Change-Id: Ie009056a78ab108556717a501399c83b477b3548
Resolves: #i122194# finally I got the correct file name
Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a
More merge changes for optional sidebar:
revert toolpanel removal, restore and re-enable task pane
remove apparently un-used SidebarFactory module
add extra visibility annotation to ItemReceiverUpdate
More information about the Libreoffice-commits
mailing list