diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-24 09:42:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-29 12:38:42 +0000 |
| commit | 1cf2cf1d4fbb1622c1789cb893d5e9fd9de1cd61 (patch) | |
| tree | 9326ea876c5d7c42fc3c05d451ed5c4fe3a242d3 /include | |
| parent | 4ccebccbe57f7dbc668e985f0db216d45d51061f (diff) | |
Resolves: fdo#81641 the new style shouldn't be a conditional style
regression from
commit 715d79bcc59d68c77dc84a1038998dd873df92e9
Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr>
Date: Fri Nov 30 11:51:46 2012 +0100
Styles & Formatting: added SFXSTYLEBIT_ALL_VISIBLE and show hidden styles
commit 2fd9c2bf9af0c50dae3af3dbe5e22965ccdb4ae7
Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr>
Date: Sun Nov 25 15:24:42 2012 +0100
Allow to hide styles in the "Styles & Formating" dialog
In its current state, the feature only hides the styles. Things to sort
out are:
+ Add some automatic filter to show hidden styles
+ Make the visibility persist in the file format
(cherry picked from commit 1af0e46102350114dd5e854b7692c640dae2727f)
Conflicts:
sw/source/uibase/app/docst.cxx
Change-Id: I7244d424765db0d5ed3aeaf380a8e1af56aa7eaf
Related: fdo#81641 exclude 'all styles' category from organizer page
it doesn't make sense to be able to assign a style to
'all styles'
Change-Id: I632c62f293b553e436ceb8da0baf2bb39941fd39
(cherry picked from commit 2223ff6cb99df097a357674801835c7a260b551d)
style category listbox depends on being unsorted
regression from
commit 6ecfbf153a7c11c63d208630ac6a27064058099d
Author: Caolán McNamara <caolanm@redhat.com>
Date: Wed Mar 13 15:10:25 2013 +0000
drop unused resources and toggle label to activate replacement widget
Change-Id: I65ca8ec58ed984120f3c2e7ba68507cbf8acf089
(cherry picked from commit 11fab6b705638359b2ca0e3e85590aa7cc70a03a)
Related: fdo#81641 create new styles with an initial name
instead of creating with a blank name and changing it later
this way undo of a style creation is initialized with its name and so create a
style followed by deleting a style and undoing all those steps doesn't crash
(cherry picked from commit e904562af54545684b32d2042ded6bdb9459edca)
Conflicts:
sw/source/uibase/app/docst.cxx
Change-Id: Ida7a34410d5d7b05edcb86950aabb3c672b82c8f
Reviewed-on: https://gerrit.libreoffice.org/10502
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/styledlg.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index eb6d15205409..41a90204a538 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -25,6 +25,7 @@ #include <sfx2/tabdlg.hxx> class SfxStyleSheetBase; +class SfxStyleSheetBasePool; class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog { @@ -45,6 +46,8 @@ public: const SfxStyleSheetBase& GetStyleSheet() const { return *pStyle; } virtual short Ok() SAL_OVERRIDE; + + static OUString GenerateUnusedName(SfxStyleSheetBasePool &rPool); }; #endif |